Support grabbing portage buildbot artifacts

src/scripts/sync_build_test.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 sync your checkout, build a Chromium OS image, and test it all
 # with one command.  Can also check out a new Chromium OS checkout and
 # perform a subset of the above operations.
 #
@@ skipping 130 matching lines @@
     # to live update the image.
     FLAGS_image_to_live=${FLAGS_TRUE}
   fi
 
   # If they gave us a remote host, then we assume they want us to do a live
   # update.
   if [[ -n "${FLAGS_remote}" ]]; then
     FLAGS_image_to_live=${FLAGS_TRUE}
   fi
 
-  # Grabbing a buildbot build is exclusive with building
+  # Grabbing a buildbot build is exclusive with syncing and building
   if [[ -n "${FLAGS_grab_buildbot}" ]]; then
-    if [[ -z "${FLAGS_buildbot_uri}" ]]; then
-      echo "--grab_buildbot requires --buildbot_uri"
-      exit 1
+    if [[ "${FLAGS_grab_buildbot}" == "LATEST" ]]; then
+      if [[ -z "${FLAGS_buildbot_uri}" ]]; then
+        echo "--grab_buildbot=LATEST requires --buildbot_uri or setting "
+        echo "BUILDBOT_URI"
+        exit 1
+      fi
     fi
+    FLAGS_sync=${FLAGS_FALSE}
     FLAGS_build=${FLAGS_FALSE}
     FLAGS_master=${FLAGS_FALSE}
   fi
 
   if [[ ${FLAGS_image_to_live} -eq ${FLAGS_TRUE} ]]; then
     if [[ ${FLAGS_mod_image_for_test} -eq ${FLAGS_FALSE} ]]; then
       echo "WARNING: You have specified to live reimage a machine with"
       echo "an image that is not modified for test (so it cannot be"
       echo "later live reimaged)"
     fi
@@ skipping 65 matching lines @@
     echo " * Master image (build_image)"
   fi
   if [[ -n "${FLAGS_grab_buildbot}" ]]; then
     if [[ "${FLAGS_grab_buildbot}" == "LATEST" ]]; then
       echo " * Grab latest buildbot image under ${FLAGS_buildbot_uri}"
     else
       echo " * Grab buildbot image zip at URI ${FLAGS_grab_buildbot}"
     fi
   fi
   if [[ ${FLAGS_mod_image_for_test} -eq ${FLAGS_TRUE} ]]; then
-    echo " * Make image able to run tests (mod_image_for_test)"
+    if [[ -n "${FLAGS_grab_buildbot}" ]]; then
+      echo " * Use the prebuilt image modded for test (rootfs_test.image)"
+      echo " * Install prebuilt cross-compiled autotests in chroot"
+    else
+      echo " * Make image able to run tests (mod_image_for_test)"
+    fi
     set_passwd=${FLAGS_TRUE}
   fi
   if [[ ${set_passwd} -eq ${FLAGS_TRUE} ]]; then
     if [[ -n "${FLAGS_chronos_passwd}" ]]; then
       echo " * Set chronos password to ${FLAGS_chronos_passwd}"
     else
       echo " * Set chronos password randomly"
     fi
   fi
   if [[ -n "${FLAGS_image_to_usb}" ]]; then
@@ skipping 62 matching lines @@
 function describe_phase() {
   local desc="$1"
   echo ""
   echo "#"
   echo "#"
   echo "# ${desc}"
   echo "#"
 }
 
 
+# Called when there is a failure and we exit early
+function failure() {
+  trap - EXIT
+  describe_phase "Failure during: ${LAST_PHASE}"
+  show_duration
+}
+
+
 # Runs a phase, describing it first, and also updates the sudo timeout
 # afterwards.
 # Arguments:
 #   $1 - phase description
 #   $2.. - command/params to run
 function run_phase() {
   local desc="$1"
   shift
+  LAST_PHASE="${desc}"
   describe_phase "${desc}"
   echo "+ $@"
   "$@"
   sudo -v
 }
 
 
 # Runs a phase, similar to run_phase, but runs within the chroot.
 # Arguments:
 #   $1 - phase description
@@ skipping 69 matching lines @@
     fi
     FLAGS_grab_buildbot="${FLAGS_buildbot_uri}/${latest}/image.zip"
   fi
   local dl_dir=$(mktemp -d "/tmp/image.XXXX")
   echo "Grabbing image from ${FLAGS_grab_buildbot} to ${dl_dir}"
   run_phase "Downloading image" curl "${FLAGS_grab_buildbot}" \
       -o "${dl_dir}/image.zip"
   cd "${dl_dir}"
   unzip image.zip
   check_rootfs_validity
-  echo "Copying in local_repo/local_packages"
-  # TODO(kmixter): Make this architecture indep once buildbot is.
-  mv -f local_repo/local_packages/* "${FLAGS_top}/src/build/x86/local_packages"
   local image_basename=$(basename $(dirname "${FLAGS_grab_buildbot}"))
-  local image_dir="${FLAGS_top}/src/build/images/${image_basename}"
+  local image_base_dir="${FLAGS_top}/src/build/images/${FLAGS_board}"
+  local image_dir="${image_base_dir}/${image_basename}"
   echo "Copying in build image to ${image_dir}"
   rm -rf "${image_dir}"
   mkdir -p "${image_dir}"
   # Note that if mbr.image does not exist, this image was not successful.
   mv mbr.image rootfs.image "${image_dir}"
+  if [[ ${FLAGS_mod_image_for_test} -eq ${FLAGS_TRUE} ]]; then
+    run_phase "Installing buildbot test modified image" \
+      mv rootfs_test.image "${image_dir}/rootfs.image"
+    FLAGS_mod_image_for_test=${FLAGS_FALSE}
+    if [[ -e "autotest.tgz" || -e "autotest.tar.bz2" ]]; then
+      # pull in autotest
+      local dir="${FLAGS_chroot}/build/${FLAGS_board}/usr/local"
+      local tar_args="xzf"
+      local tar_name="${dl_dir}/autotest.tgz"
+      if [[ -e "autotest.tar.bz2" ]]; then
+        tar_args="xjf"
+        tar_name="${dl_dir}/autotest.tar.bz2"
+      fi
+      sudo rm -rf "${dir}/autotest"
+      cd ${dir}
+      run_phase "Installing buildbot autotest cross-compiled binaries" \
+        sudo tar ${tar_args} "${tar_name}"
+    fi
+  fi
   chdir_relative .
   run_phase "Removing downloaded image" rm -rf "${dl_dir}"
 }
 
+
 function main() {
   assert_outside_chroot
   assert_not_root_user
 
   # Parse command line
   FLAGS "$@" || exit 1
   eval set -- "${FLAGS_ARGV}"
 
   # Die on any errors.
   set -e
 
   validate_and_set_param_defaults
 
   # Cache up sudo status
   sudo -v
 
   if [[ ${FLAGS_interactive} -eq ${FLAGS_TRUE} ]]; then
     interactive
   fi
 
   set_start_time
+  trap failure EXIT
 
   local withdev_param=""
   if [[ ${FLAGS_withdev} -eq ${FLAGS_TRUE} ]]; then
     withdev_param="--withdev"
   fi
 
   local jobs_param=""
   if [[ ${FLAGS_jobs} -gt 1 ]]; then
     jobs_param="--jobs=${FLAGS_jobs}"
   fi
@@ skipping 74 matching lines @@
 
   if [[ -n "${FLAGS_test}" ]]; then
     chdir_relative src/scripts
     # We purposefully do not quote FLAGS_test below as we expect it may
     # have multiple parameters
     run_phase "Running tests on Chromium OS machine ${FLAGS_remote}" \
       ./run_remote_tests.sh "--remote=${FLAGS_remote}" ${FLAGS_test} \
       "${board_param}"
   fi
 
+  trap - EXIT
   echo "Successfully used ${FLAGS_top} to:"
   describe_steps
   show_duration
 }
 
 
 main $@