autotest: Fix grab-buildbot in sync_build_test by gsdizing it

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 44 matching lines @@
 DEFINE_string chrome_root "" \
     "The root of your chrome browser source. Should contain a 'src' subdir. \
 If this is set, chrome browser will be built from source."
 DEFINE_string chronos_passwd "${CHRONOS_PASSWD}" \
     "Use this as the chronos user passwd (defaults to \$CHRONOS_PASSWD)"
 DEFINE_string chroot "" "Chroot to build/use"
 DEFINE_boolean force_make_chroot ${FLAGS_FALSE} "Run make_chroot indep of sync"
 DEFINE_string grab_buildbot "" \
     "Instead of building, grab this full image.zip URI generated by the \
 buildbot"
+DEFINE_boolean ignore_remote_test_failures ${FLAGS_FALSE} \
+    "Ignore any remote tests that failed and don't return failure"
 DEFINE_boolean image_to_live ${FLAGS_FALSE} \
     "Put the resulting image on live instance (requires --remote)"
 DEFINE_string image_to_usb "" \
     "Treat this device as USB and put the image on it after build"
 # You can set jobs > 1 but then your build may break and you may need
 # to retry.  Setting it to 1 is best for non-interactive sessions.
 DEFINE_boolean interactive ${FLAGS_FALSE} \
     "Tell user what we plan to do and wait for input to proceed" i
 DEFINE_integer jobs -1 "Concurrent build jobs"
 DEFINE_boolean master ${FLAGS_TRUE} "Master an image from built code"
@@ skipping 101 matching lines @@
   if [[ -n "${FLAGS_grab_buildbot}" ]]; then
     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_unittest=${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
     if [[ -n "${FLAGS_image_to_usb}" ]]; then
@@ skipping 247 matching lines @@
     echo <<EOF > src/scripts/.chromeos_dev
 # Assume Chrome is checked out nearby
 CHROMEOS_CHROME_DIR="${base_dir}/chrome"
 EOF
   fi
 }
 
 
 # Downloads a buildbot image
 function grab_buildbot() {
+  read -p "Username [${LOGNAME}]: " GSDCURL_USERNAME
+  export GSDCURL_USERNAME
+  read -s -p "Password: " GSDCURL_PASSWORD
+  export GSDCURL_PASSWORD
+  CURL="$(dirname $0)/bin/cros_gsdcurl.py"
   if [[ "${FLAGS_grab_buildbot}" == "LATEST" ]]; then
-    local latest=$(curl "${FLAGS_buildbot_uri}/LATEST")
+    local latest=$(${CURL} "${FLAGS_buildbot_uri}/LATEST")
     if [[ -z "${latest}" ]]; then
       echo "Error finding latest."
       exit 1
     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"
+  run_phase "Downloading image" ${CURL} "${FLAGS_grab_buildbot}" \
+    -o "${dl_dir}/image.zip"
+  # Clear out the credentials so they can't be used later.

[petkov, 2010/09/24 21:35:37]

You should probably do this in the failure() function too.

+  export GSDCURL_USERNAME=""
+  export GSDCURL_PASSWORD=""
+
   cd "${dl_dir}"
   unzip image.zip
   local image_basename=$(basename $(dirname "${FLAGS_grab_buildbot}"))
   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}"
   if [[ ${FLAGS_mod_image_for_test} -eq ${FLAGS_TRUE} ]]; then
     run_phase "Installing buildbot test modified image" \
       mv chromiumos_test_image.bin "${image_dir}/chromiumos_image.bin"
     FLAGS_mod_image_for_test=${FLAGS_FALSE}
+  else
+    run_phase "Installing buildbot base image" \
+    mv chromiumos_base_image.bin "${image_dir}/chromiumos_image.bin"
+  fi
+
+  if [[ -n "${FLAGS_test}" ]]; then
+    if [[ ! -d "${FLAGS_top}/chroot/build/${FLAGS_board}" ]]; then
+      echo "To run tests on a buildbot image, run setup_board first."

[petkov, 2010/09/24 21:35:37]

die?

+      exit 1
+    fi
     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"
       # Expand in temp directory as current user, then move it as
       # root to keep local user ownership
       run_phase "Unpacking buildbot autotest cross-compiled binaries" \
         tar ${tar_args} "${tar_name}"
       run_phase "Installing buildbot autotest cross-compiled binaries" \
         sudo mv autotest ${dir}
     fi
-  else
-    mv chromiumos_image.bin "${image_dir}"
   fi
   chdir_relative .
   run_phase "Removing downloaded image" rm -rf "${dl_dir}"
 }
 
 
 function main() {
   assert_outside_chroot
   assert_not_root_user
 
@@ skipping 56 matching lines @@
 
     chdir_relative src/scripts
     # Only setup board target if the directory does not exist
     if [[ ! -d "${FLAGS_top}/chroot/build/${FLAGS_board}" ]]; then
       run_phase_in_chroot "Setting up board target" \
           ./setup_board ${pkg_param} "${board_param}"
     fi
     local build_autotest_param=""
     if [[ ${FLAGS_build_autotest} -eq ${FLAGS_TRUE} ]]; then
       build_autotest_param="--withautotest"
-      if [[ ${FLAGS_useworkon} -eq ${FLAGS_TRUE} ]]; then
-        # In workon flow, you must workon packages to run tests
-        run_phase_in_chroot "Setting workon for autotest" \
-          ./cros_workon --board=${FLAGS_board} start autotest \
-          autotest-tests autotest-deps
-        # In minilayout you may not yet have autotest.
-        if [[ ! -d "${FLAGS_top}/src/third_party/autotest/files" ]]; then
-          run_phase "Syncing autotest repo" repo sync autotest
-        fi
-      fi
     fi
 
     run_phase_in_chroot "Building packages" \
         ./build_packages "${board_param}" \
         ${jobs_param} ${withdev_param} ${build_autotest_param} \
         ${pkg_param}
   fi
 
   if [[ ${FLAGS_chrome_root} ]]; then
     run_phase_in_chroot "Building Chromium browser" \
       BOARD="${FLAGS_board}" USE="build_tests" FEATURES="-usersandbox" \
       CHROME_ORIGIN=LOCAL_SOURCE emerge-${FLAGS_board} chromeos-chrome
   fi
 
   if [[ ${FLAGS_unittest} -eq ${FLAGS_TRUE} ]] && [[ "${FLAGS_board}" == \
     "x86-generic" ]] ; then
+    chdir_relative src/scripts
     run_phase_in_chroot "Running unit tests" ./cros_run_unit_tests \
       ${board_param}
   fi
 
   if [[ ${FLAGS_master} -eq ${FLAGS_TRUE} ]]; then
     chdir_relative src/scripts
     if [[ -n "${FLAGS_chronos_passwd}" ]]; then
       run_phase_in_chroot "Setting default chronos password" \
       ./enter_chroot.sh "echo '${FLAGS_chronos_passwd}' | \
                         ~/trunk/src/scripts/set_shared_user_password.sh"
@@ skipping 18 matching lines @@
   if [[ ${FLAGS_image_to_live} -eq ${FLAGS_TRUE} ]]; then
     chdir_relative src/scripts
     run_phase "Re-imaging live Chromium OS machine ${FLAGS_remote}" \
       ./image_to_live.sh "--remote=${FLAGS_remote}" --update_known_hosts
   fi
 
   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}" \
+    if ! run_phase "Running tests on Chromium OS machine ${FLAGS_remote}" \
       ./run_remote_tests.sh "--remote=${FLAGS_remote}" ${FLAGS_test} \
-      "${board_param}"
+      "${board_param}"; then
+      if [[ ${FLAGS_ignore_remote_test_failures} -eq ${FLAGS_FALSE} ]]; then
+        echo "Remote tests failed and --ignore_remote_test_failures not passed"
+        false
+      fi
+    fi
   fi
 
   trap - EXIT
   echo "Successfully used ${FLAGS_top} to:"
   describe_steps
   show_duration
 }
 
 
 main $@