Revert "Retry on build_image failures and make sbt more aggressive by default"

src/scripts/build_image

 #!/bin/bash
 
 # Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Script to build a bootable keyfob-based chromeos system image from within
 # a chromiumos setup. This assumes that all needed packages have been built into
 # the given target's root with binary packages turned on. This script will
 # build the Chrome OS image using only pre-built binary packages.
@@ skipping 17 matching lines @@
 DEFINE_string output_root "${DEFAULT_BUILD_ROOT}/images" \
   "Directory in which to place image result directories (named by version)"
 DEFINE_boolean replace $FLAGS_FALSE \
   "Overwrite existing output, if any."
 DEFINE_boolean withdev $FLAGS_TRUE \
   "Include useful developer friendly utilities in the image."
 DEFINE_boolean installmask $FLAGS_TRUE \
   "Use INSTALL_MASK to shrink the resulting image."
 DEFINE_integer jobs -1 \
   "How many packages to build in parallel at maximum."
-DEFINE_integer retries -1 \
-  "On image mastering failure, the number of times to retry"
 DEFINE_boolean statefuldev $FLAGS_FALSE \
   "Install development packages on stateful partition rather than the rootfs"
 DEFINE_string to "" \
   "The target image file or device"
 DEFINE_boolean withtest $FLAGS_FALSE \
   "Include packages required for testing and prepare image for testing"
 DEFINE_string factory_server "" \
   "Build a factory install image pointing to given server."
 
 # Parse command line.
@@ skipping 228 matching lines @@
 sudo cp -a "${BOARD_ROOT}"/lib/libgcc_s.so* "${ROOT_FS_DIR}/lib"
 sudo cp -a "${BOARD_ROOT}"/usr/lib/libstdc++.so* "${ROOT_FS_DIR}/usr/lib"
 
 INSTALL_MASK=""
 if [[ $FLAGS_installmask -eq ${FLAGS_TRUE} ]] ; then
   INSTALL_MASK="$DEFAULT_INSTALL_MASK"
 fi
 
 if [[ $FLAGS_jobs -ne -1 ]]; then
   EMERGE_JOBS="--jobs=$FLAGS_jobs"
-  if [[ $FLAGS_retries -eq -1 ]]; then
-    # The jobs flag can be flaky. Retry once by default,
-    # without the jobs flag.
-    FLAGS_retries=1
-  fi
 fi
 
 # Prepare stateful partition with some pre-created directories
 sudo mkdir -p "${DEV_IMAGE_ROOT}"
 sudo mkdir -p "${STATEFUL_DIR}/var"
 
 # Create symlinks so that /usr/local/usr based directories are symlinked to
 # /usr/local/ directories e.g. /usr/local/usr/bin -> /usr/local/bin, etc.
 setup_symlinks_on_root "${DEV_IMAGE_ROOT}" "${STATEFUL_DIR}/var"
 
 # Perform binding rather than symlinking because directories must exist
 # on rootfs so that we can bind at run-time since rootfs is read-only
 echo "Binding directories from stateful partition onto the rootfs"
 sudo mkdir -p "${ROOT_FS_DIR}/usr/local"
 sudo mount --bind "${DEV_IMAGE_ROOT}" "${ROOT_FS_DIR}/usr/local"
 sudo mkdir -p "${ROOT_FS_DIR}/var"
 sudo mount --bind "${STATEFUL_DIR}/var" "${ROOT_FS_DIR}/var"
 
 # We "emerge --root=$ROOT_FS_DIR --root-deps=rdeps --usepkgonly" all of the
 # runtime packages for chrome os. This builds up a chrome os image from binary
 # packages with runtime dependencies only.  We use INSTALL_MASK to trim the
 # image size as much as possible.
-eretry sudo INSTALL_MASK="$INSTALL_MASK" emerge-${BOARD} \
+sudo INSTALL_MASK="$INSTALL_MASK" emerge-${BOARD} \
   --root="$ROOT_FS_DIR" --root-deps=rdeps \
   --usepkgonly chromeos $EMERGE_JOBS
 
 # Determine the root dir for development packages.
 ROOT_DEV_DIR="$ROOT_FS_DIR"
 [ $FLAGS_statefuldev -eq $FLAGS_TRUE ] && ROOT_DEV_DIR="$ROOT_FS_DIR/usr/local"
 
 # Install development packages.
 if [[ $FLAGS_withdev -eq $FLAGS_TRUE ]] ; then
-  eretry sudo INSTALL_MASK="$INSTALL_MASK" emerge-${BOARD} \
+  sudo INSTALL_MASK="$INSTALL_MASK" emerge-${BOARD} \
       --root="$ROOT_DEV_DIR" --root-deps=rdeps \
       --usepkgonly chromeos-dev $EMERGE_JOBS
 
   # TODO(sosa@chromium.org) - Re-hide under statefuldev after switch
   # Flag will mount /usr/local on target device
   sudo mkdir -p "$ROOT_FS_DIR/root"
   sudo touch "$ROOT_FS_DIR/root/.dev_mode"
 
   # The ldd tool is a useful shell script but lives in glibc; just copy it.
   sudo cp -a "$(which ldd)" "${ROOT_DEV_DIR}/usr/bin"
 fi
 
 if [ -n "$FLAGS_factory_server" ]; then
-  eretry sudo INSTALL_MASK="$INSTALL_MASK" emerge-${BOARD} \
+  sudo INSTALL_MASK="$INSTALL_MASK" emerge-${BOARD} \
       --root="$ROOT_DEV_DIR" --root-deps=rdeps \
       --usepkgonly chromeos-factoryinstall $EMERGE_JOBS
 fi
 
 # Install packages required for testing.
 if [[ $FLAGS_withtest -eq $FLAGS_TRUE ]] ; then
-  eretry sudo INSTALL_MASK="$INSTALL_MASK" emerge-${BOARD} \
+  sudo INSTALL_MASK="$INSTALL_MASK" emerge-${BOARD} \
       --root="$ROOT_DEV_DIR" --root-deps=rdeps \
       --usepkgonly chromeos-test $EMERGE_JOBS
 fi
 
 # Perform any customizations on the root file system that are needed.
 EXTRA_CUSTOMIZE_ROOTFS_FLAGS=""
 if [ $FLAGS_withdev -eq $FLAGS_TRUE ]; then
   EXTRA_CUSTOMIZE_ROOTFS_FLAGS="--withdev"
 fi
 if [ -n "$FLAGS_factory_server" ]; then
@@ skipping 81 matching lines @@
 
 OUTSIDE_OUTPUT_DIR="../build/images/${FLAGS_board}/${IMAGE_SUBDIR}"
 echo "Done.  Image created in ${OUTPUT_DIR}"
 echo "To copy to USB keyfob, OUTSIDE the chroot, do something like:"
 echo "  ./image_to_usb.sh --from=${OUTSIDE_OUTPUT_DIR} --to=/dev/sdb"
 echo "To convert to VMWare image, OUTSIDE the chroot, do something like:"
 echo "  ./image_to_vmware.sh --from=${OUTSIDE_OUTPUT_DIR}"
 echo "from the scripts directory where you entered the chroot."
 
 trap - EXIT