Rebuild image for factory

archive_build.sh

 #!/bin/bash
 
 # Copyright (c) 2010 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 archive build results.  Used by the buildbots.
 
 # --- BEGIN COMMON.SH BOILERPLATE ---
 # Load common CrOS utilities.  Inside the chroot this file is installed in
@@ skipping 133 matching lines @@
   echo "Modifying image for test"
   ./enter_chroot.sh -- ./mod_image_for_test.sh --board $FLAGS_board \
       --noinplace --yes
 
   pushd "${FLAGS_chroot}/build/${FLAGS_board}/usr/local"
   echo "Archiving autotest build artifacts"
   tar cjf "${FLAGS_from}/autotest.tar.bz2" --checkpoint=1000 autotest
   popd
 fi
 
-if [ $FLAGS_factory_test_mod -eq $FLAGS_TRUE ]; then
-  echo "Modifying image for factory test"
-  ./enter_chroot.sh -- ./mod_image_for_test.sh --board $FLAGS_board \
-      --yes --noinplace --factory
-fi
-
 # Modify for recovery
 if [ $FLAGS_official_build -eq $FLAGS_TRUE ]; then
   BUILDVER="$(readlink ${IMAGES_DIR}/${FLAGS_board}/latest)"
   CHROOT_IMAGE_DIR=/home/$USER/trunk/src/build/images/$FLAGS_board/$BUILDVER
   ./enter_chroot.sh -- ./mod_image_for_recovery.sh --board $FLAGS_board \
     --image $CHROOT_IMAGE_DIR/chromiumos_base_image.bin
 fi
 
 # Remove the developer build if test image is also built.
 if [ $FLAGS_remove_dev -eq $FLAGS_TRUE ]; then
   rm -f "${FLAGS_from}/${CHROMEOS_IMAGE_NAME}"
 fi
 
+if [ $FLAGS_factory_test_mod -eq $FLAGS_TRUE ]; then
+  echo "Generating image for factory test"
+  # HACK: The build system can't currently handle more than one image size
+  # at a time. Therefore it's necessary to do another round of build after
+  # archiving the original build. This should be fixed in Chromite.
+
+  # HACK: cbuild has a special case when running on chrome-bot that
+  # zeroes out the current revision, which makes calling build_image directly
+  # fail. You must explictly call replace and specify a unique name numerically
+  # using build_attempt.
+  ./enter_chroot.sh -- ./build_image --board $FLAGS_board \
+      --replace --noenable_rootfs_verification --build_attempt 4
+
+  ./enter_chroot.sh -- ./mod_image_for_test.sh --board $FLAGS_board \
+      --yes --noinplace --factory
+
+  # Get the factory test dir: It is the newest build.
+  # This is the output dir for the factory shim, the factory test and
+  # release images will remain in IMG_DIR, defined previously.
+  FACTORY_DIR="$(readlink ${IMAGES_DIR}/${FLAGS_board}/latest)"
+
+  echo "Factory image dir: ${FACTORY_DIR}"
+fi
+
 # Build differently sized shims. Currently only factory install shim is
 # supported, TODO(tgao): Add developer shim.
 if [ $FLAGS_factory_install_mod -eq $FLAGS_TRUE ]; then
   echo "Building factory install shim."
   # HACK: The build system can't currently handle more than one image size
-  # at a time. Therefor eit's necessary to do another round of build after
+  # at a time. Therefore it's necessary to do another round of build after
   # archiving the original build. This should be fixed in Chromite.
 
   # HACK: cbuild has a special case when running on chrome-bot that
   # zeroes out the current revision, which makes calling build_image directly
   # fail. You must explictly call replace and specify a unique name numerically
   # using build_attempt.
   ./enter_chroot.sh -- ./build_image --board $FLAGS_board --factory_install \
       --replace --build_attempt 7
 
   # Get the install shim dir: It is the newest build.
   # This is the output dir for the factory shim, the factory test and
   # release images will remain in IMG_DIR, defined previously.
   SHIM_DIR="$(readlink ${IMAGES_DIR}/${FLAGS_board}/latest)"
 
-  echo "Factory image dir: ${IMG_DIR}"
   echo "Factory install shim dir: ${SHIM_DIR}"
 fi
 
 # Zip the build
 echo "Compressing and archiving build..."
 cd "$FLAGS_from"
 MANIFEST=`ls | grep -v factory`
 zip -r "${ZIPFILE}" ${MANIFEST}
 
 if [ $FLAGS_factory_test_mod -eq $FLAGS_TRUE ] || \
    [ $FLAGS_factory_install_mod -eq $FLAGS_TRUE ]; then
   # We need to have directory structure for factory package, as
   # signing and packaging utilities need unpack_partitions.sh.
   echo "Compressing factory software"
   pushd ..
-  [ -n "${SHIM_DIR}" ] && rm -f factory_shim && ln -s "${SHIM_DIR}" factory_shim
-  [ -n "${IMG_DIR}" ] && rm -f factory_test && ln -s "${IMG_DIR}" factory_test
+  [ -n "${SHIM_DIR}" ] && rm -f factory_shim && \
+      ln -s "${SHIM_DIR}" factory_shim
+  [ -n "${FACTORY_DIR}" ] && rm -f factory_test && \
+      ln -s "${FACTORY_DIR}" factory_test
 
   # Restore "latest" status to the original image.
   # The "latest" symlink and latest timestamp are used extensively
   # throughout the build scripts rather than explicitly specifying an image.
   touch "${IMG_DIR}"
   [ -n "${IMG_DIR}" ] && rm -f latest && ln -s "${IMG_DIR}" latest
   FACTORY_MANIFEST=`find factory_shim factory_test -follow \
       -type f  | grep -E "(factory_image|factory_install|partition)"`
   zip "${FACTORY_ZIPFILE}" ${FACTORY_MANIFEST}
   echo "Zipped"
@@ skipping 101 matching lines @@
 # Purge old builds if necessary
 if [ $FLAGS_keep_max -gt 0 ]; then
   echo "Deleting old builds (all but the newest ${FLAGS_keep_max})..."
   cd "$FLAGS_to"
   # +2 because line numbers start at 1 and need to skip LATEST file
   rm -rf `ls -t1 | tail --lines=+$(($FLAGS_keep_max + 2))`
   cd -
 fi
 
 echo "Done."