Remove old logic ... and don't needlessly modifiy dev image.

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 121 matching lines @@
 OUTDIR="${FLAGS_to}/${LAST_CHANGE}"
 ZIPFILE="${OUTDIR}/${FLAGS_zipname}"
 FACTORY_ZIPFILE="${OUTDIR}/factory_${FLAGS_zipname}"
 echo "archive to dir: $OUTDIR"
 echo "archive to file: $ZIPFILE"
 
 rm -rf "$OUTDIR"
 mkdir -p "$OUTDIR"
 
 
 SRC_IMAGE="${FLAGS_from}/chromiumos_image.bin"

[sjg, 2011/02/15 15:19:42]

You can use ${CHROMEOS_IMAGE_NAME} here if you like.

[sosa, 2011/02/15 22:08:12]

Done.

-BACKUP_IMAGE="${FLAGS_from}/chromiumos_image_bkup.bin"
 
 # Apply mod_image_for_test to the developer image, and store the
 # result in a new location. Usage:
 # do_chroot_mod "$OUTPUT_IMAGE" "--flags_to_mod_image_for_test"
 function do_chroot_mod() {
   MOD_ARGS=$2
   OUTPUT_IMAGE=$1

[sjg, 2011/02/15 15:19:42]

Great, a use for --noinplace.

I think this function could go away - $1 is not used and $2 is blank!

Also you might find that you can use prepare_test_image() here (from common.sh).

But given that you are already cleaning up code, I'm happy to LGTM if this is as
far as you want to go.

[sosa, 2011/02/15 22:08:12]

See note.  Still want in place but I need the mv's for Factory images

On 2011/02/15 15:19:42, sjg wrote:

-  cp -f "${SRC_IMAGE}" "${BACKUP_IMAGE}"
   ./enter_chroot.sh -- ./mod_image_for_test.sh --board $FLAGS_board \
-      --yes ${MOD_ARGS}
-  mv "${SRC_IMAGE}" "${OUTPUT_IMAGE}"
-  mv "${BACKUP_IMAGE}" "${SRC_IMAGE}"
+      --yes --noinplace ${MOD_ARGS}
 }
 
 # Modify image for test if flag set.
 if [ $FLAGS_test_mod -eq $FLAGS_TRUE ]; then
   echo "Modifying image for test"
   do_chroot_mod "${FLAGS_from}/chromiumos_test_image.bin" ""
 
   pushd "${FLAGS_chroot}/build/${FLAGS_board}/usr/local"
   echo "Archiving autotest build artifacts"
   tar cjf "${FLAGS_from}/autotest.tar.bz2" --checkpoint=1000 autotest
@@ skipping 171 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."