Archive debug artifacts - take two

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.
 
 # Load common constants.  This should be the first executable line.
 # The path to common.sh should be relative to your script's location.
 . "$(dirname "$0")/common.sh"
 
 # Script must be run outside the chroot
 assert_outside_chroot
 
 IMAGES_DIR="${DEFAULT_BUILD_ROOT}/images"
 # Default to the most recent image
 DEFAULT_TO="${GCLIENT_ROOT}/archive"
 DEFAULT_FROM="${IMAGES_DIR}/$DEFAULT_BOARD/$(ls -t1 \
               $IMAGES_DIR/$DEFAULT_BOARD 2>&-| head -1)"
 
 # Flags
+DEFINE_boolean archive_debug $FLAGS_TRUE \
+    "Archive debug information for build"
 DEFINE_string board "$DEFAULT_BOARD" \
     "The board to build packages for."
+DEFINE_string build_number "" \
+    "The build-bot build number (when called by buildbot only)." "b"
 DEFINE_string chroot "$DEFAULT_CHROOT_DIR" \
     "The chroot of the build to archive."
+DEFINE_boolean factory_install_mod $FLAGS_FALSE \
+    "Modify image for factory install purposes"
+DEFINE_boolean factory_test_mod $FLAGS_FALSE \
+    "Modify image for factory testing purposes"
 DEFINE_string from "$DEFAULT_FROM" \
     "Directory to archive"
-DEFINE_string to "$DEFAULT_TO" "Directory of build archive"
-DEFINE_integer keep_max 0 "Maximum builds to keep in archive (0=all)"
-DEFINE_string zipname "image.zip" "Name of zip file to create."
-DEFINE_boolean official_build $FLAGS_FALSE "Set CHROMEOS_OFFICIAL=1 for release builds."
-DEFINE_string build_number "" \
-    "The build-bot build number (when called by buildbot only)." "b"
-DEFINE_boolean test_mod $FLAGS_TRUE "Modify image for testing purposes"
-DEFINE_boolean factory_test_mod $FLAGS_FALSE \
-    "Modify image for factory testing purposes"
-DEFINE_boolean factory_install_mod $FLAGS_FALSE \
-    "Modify image for factory install purposes"
 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_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_boolean test_mod $FLAGS_TRUE "Modify image for testing purposes"
+DEFINE_string to "$DEFAULT_TO" "Directory of build archive"
+DEFINE_string zipname "image.zip" "Name of zip file to create."
 
 # Parse command line
 FLAGS "$@" || exit 1
 eval set -- "${FLAGS_ARGV}"
 
 # Set if default from path is used
 DEFAULT_USED=
 
 # Reset "default" FLAGS_from based on passed-in board if not set on cmd-line
 if [ "$FLAGS_from" = "$DEFAULT_FROM" ]
@@ skipping 123 matching lines @@
 echo "$LAST_CHANGE" > "${FLAGS_to}/LATEST"
 
 # Make sure files are readable
 chmod 644 "$ZIPFILE" "${FLAGS_to}/LATEST"
 chmod 755 "$OUTDIR"
 
 
 function gsutil_archive() {
   IN_PATH="$1"
   OUT_PATH="$2"
-  if [ $FLAGS_gsutil_archive != "" ]
+  if [ -n "$FLAGS_gsutil_archive" ]
   then
     FULL_OUT_PATH="${FLAGS_gsutil_archive}/${OUT_PATH}"
     echo "Using gsutil to archive to ${OUT_PATH}..."
     ${FLAGS_gsutil} cp ${IN_PATH} ${FULL_OUT_PATH}
     ${FLAGS_gsutil} setacl ${FLAGS_acl} ${FULL_OUT_PATH}
     if [ $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
   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"
 fi
 
+if [ $FLAGS_archive_debug -eq $FLAGS_TRUE ]
+then
+  echo "Creating debug archive"
+  pushd "${FLAGS_chroot}/build/${FLAGS_board}/usr/lib"
+  sudo tar czf "${OUTDIR}/debug.tgz" --exclude debug/usr/local/autotest \
+      --exclude debug/tests debug
+  CMD="chown \${SUDO_UID}:\${SUDO_GID} ${OUTDIR}/debug.tgz"
+  sudo sh -c "${CMD}"
+  popd
+fi
+
 gsutil_archive "${ZIPFILE}" "${LAST_CHANGE}/${FLAGS_zipname}"
 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}"
 fi
 gsutil_archive "${FLAGS_to}/LATEST" "LATEST"
 
 # 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."