Add in a gsutil_append_latest bool option to avoid appending ChromeOS-Hash-B#

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 42 matching lines @@
 DEFINE_string from "$DEFAULT_FROM" \
     "Directory to archive"
 DEFINE_string gsutil "gsutil" \
     "Location of gsutil"
 DEFINE_string gsd_gen_index "" \
     "Location of gsd_generate_index.py"
 DEFINE_string acl "private" \
     "ACL to set on GSD archives"
 DEFINE_string gsutil_archive "" \
     "Optional datastore archive location"
+DEFINE_boolean gsutil_append_last_change $FLAGS_TRUE \
+    "Optional Whether to append build # and chrome os hash to GS uploads"
 DEFINE_integer keep_max 0 "Maximum builds to keep in archive (0=all)"
 DEFINE_boolean official_build $FLAGS_FALSE \
     "Set CHROMEOS_OFFICIAL=1 for release builds."
 DEFINE_string test_tarball "" "Optional path to test tarball to archive"
 DEFINE_boolean test_mod $FLAGS_TRUE "Modify image for testing purposes"
 DEFINE_boolean prebuilt_upload $FLAGS_FALSE "Upload prebuilt binary packages."
 DEFINE_boolean remove_dev $FLAGS_TRUE "Remove the de image during archive."
 DEFINE_string to "$DEFAULT_TO" "Directory of build archive"
 DEFINE_string zipname "image.zip" "Name of zip file to create."
 
@@ skipping 174 matching lines @@
 
 # Make sure files are readable
 chmod 644 "$ZIPFILE" "${FLAGS_to}/LATEST"
 chmod 755 "$OUTDIR"
 cp -f  "${FLAGS_from}/au-generator.zip" "${OUTDIR}/"
 
 
 function gsutil_archive() {
   IN_PATH="$1"
   OUT_PATH="$2"
+  if [ ${FLAGS_gsutil_append_last_change} -eq ${FLAGS_TRUE} ]; then
+     OUT_PATH="${LAST_CHANGE}/${OUT_PATH}"
+  fi
+
   echo "Using gsutil to archive to ${OUT_PATH}..."
   if [ -z "$FLAGS_gsutil_archive" -o ${FLAGS_debug} -eq ${FLAGS_TRUE} ]; then
     echo -n "In debug mode.  Would have run: "
     echo "gsutil cp ${IN_PATH} <gsutil_archive>/${OUT_PATH}"
     return
   fi
 
   FULL_OUT_PATH="${FLAGS_gsutil_archive}/${OUT_PATH}"
   ${FLAGS_gsutil} cp ${IN_PATH} ${FULL_OUT_PATH}
   ${FLAGS_gsutil} setacl ${FLAGS_acl} ${FULL_OUT_PATH}
   if [ -n "$FLAGS_gsd_gen_index" ]; then
     echo "Updating indexes..."
     ${FLAGS_gsd_gen_index} \
       --gsutil=${FLAGS_gsutil} \
       -a ${FLAGS_acl} \
       -p ${FULL_OUT_PATH} ${FLAGS_gsutil_archive}
   fi
 }
 
 if [ $FLAGS_test_mod -eq $FLAGS_TRUE -a $FLAGS_official_build -eq $FLAGS_TRUE ]
 then
   echo "Creating hwqual archive"
   HWQUAL_NAME="chromeos-hwqual-${FLAGS_board}-${CHROMEOS_VERSION_STRING}"
   "${SCRIPTS_DIR}/archive_hwqual" --from "${OUTDIR}" \
     --output_tag "${HWQUAL_NAME}"
   gsutil_archive "${OUTDIR}/${HWQUAL_NAME}.tar.bz2" \
-    "${LAST_CHANGE}/${HWQUAL_NAME}.tar.bz2"
+    "${HWQUAL_NAME}.tar.bz2"
 fi
 
 
 if [ $FLAGS_prebuilt_upload -eq $FLAGS_TRUE ]; then
   # Construct prebuilt upload command.
   # This will upload prebuilt packages to Google Storage.
   prebuilt_cmd="${GCLIENT_ROOT}/chromite/buildbot/prebuilt.py"
   prebuilt_cmd="$prebuilt_cmd -u gs://chromeos-prebuilt --git-sync -V master"
   prebuilt_cmd="$prebuilt_cmd -p ${GCLIENT_ROOT} -b ${FLAGS_board}"
 
   if [ "${FLAGS_board}" == "x86-generic" ]
   then
     prebuilt_cmd="$prebuilt_cmd --sync-host"
   fi
 
   if [ ${FLAGS_debug} -eq ${FLAGS_FALSE} ]; then
     echo "Running $prebuilt_cmd"
     $prebuilt_cmd
   else
     echo "Would have run $prebuilt_cmd"
   fi
 fi
 
-gsutil_archive "${ZIPFILE}" "${LAST_CHANGE}/${FLAGS_zipname}"
+gsutil_archive "${ZIPFILE}" "${FLAGS_zipname}"
 
 if [ $FLAGS_archive_debug -eq $FLAGS_TRUE ]; then
   echo "Generating Breakpad symbols"
   ! ${SCRIPTS_DIR}/cros_generate_breakpad_symbols --board=${FLAGS_board}
   echo "Creating debug archive"
   pushd "${FLAGS_chroot}/build/${FLAGS_board}/usr/lib"
   sudo tar czf "${OUTDIR}/debug.tgz" --checkpoint=1000 --exclude\
       debug/usr/local/autotest --exclude debug/tests debug
   CMD="chown \${SUDO_UID}:\${SUDO_GID} ${OUTDIR}/debug.tgz"
   sudo sh -c "${CMD}"
   popd
-  gsutil_archive "${OUTDIR}/debug.tgz" "${LAST_CHANGE}/debug.tgz"
+  gsutil_archive "${OUTDIR}/debug.tgz" "debug.tgz"
 fi
 
 if [ $FLAGS_factory_test_mod -eq $FLAGS_TRUE ] || \
    [ $FLAGS_factory_install_mod -eq $FLAGS_TRUE ]; then
   gsutil_archive "${FACTORY_ZIPFILE}" \
-    "${LAST_CHANGE}/factory_${FLAGS_zipname}"
+    "factory_${FLAGS_zipname}"
 fi
 
 gsutil_archive "${FLAGS_to}/LATEST" "LATEST"
 
 if [ -n "${FLAGS_gsutil_archive}" ]; then
-  FULL_INDEX_PATH="${FLAGS_gsutil_archive}/${LAST_CHANGE}/_index.html"
+  if [ ${FLAGS_gsutil_append_last_change} -eq ${FLAGS_TRUE} ]; then
+    FULL_INDEX_PATH="${FLAGS_gsutil_archive}/${LAST_CHANGE}/_index.html"
+  else
+    FULL_INDEX_PATH="${FLAGS_gsutil_archive}/_index.html"
+  fi
   RELATIVE_ARCHIVE_URL_PATH="${FULL_INDEX_PATH#gs://}"
   echo "CROS_ARCHIVE_URL=\
 https://sandbox.google.com/storage/${RELATIVE_ARCHIVE_URL_PATH}"
 fi
 
 if [ -n "${FLAGS_test_tarball}" ]; then
-  gsutil_archive "${FLAGS_test_tarball}" "${LAST_CHANGE}/test_results.tgz"
+  gsutil_archive "${FLAGS_test_tarball}" "test_results.tgz"
 fi
 
 # 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."