Buildbot enhancements: Builder/Tester split

build/android/buildbot_functions.sh

 #!/bin/bash
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
 # Bash functions used by buildbot annotator scripts for the android
 # build of chromium.  Executing this script should not perform actions
 # other than setting variables and defining of functions.
 
 # Number of jobs on the compile line; e.g.  make -j"${JOBS}"
 JOBS="${JOBS:-4}"
 
 # Clobber build?  Overridden by bots with BUILDBOT_CLOBBER.
 NEED_CLOBBER="${NEED_CLOBBER:-0}"
 
 # Setup environment for Android build.
 # Called from bb_baseline_setup.
 # Moved to top of file so it is easier to find.
 function bb_setup_environment {
   export ANDROID_SDK_ROOT=/usr/local/google/android-sdk-linux
   export ANDROID_NDK_ROOT=/usr/local/google/android-ndk-r7
 }
 
 # Install the build deps by running
 # build/install-build-deps-android-sdk.sh.  This may update local tools.
 # $1: source root.
 function bb_install_build_deps {
   echo "@@@BUILD_STEP install build deps android@@@"
-  local script="$1/build/install-build-deps-android-sdk.sh"
+  local script="${1-$SRC_ROOT}/build/install-build-deps-android-sdk.sh"

[John Grabowski, 2012/06/18 18:20:04]

Args to this function say you must pass in a SRC_ROOT, not "if you want or we'll
figure it out".

Trying hard to not reference globals, especially since the test mode for this
script is "in your current shell environment".


Do you feel strongly?

[Isaac (away), 2012/06/18 18:59:46]

Was trying to keep backwards compatibility for scripts that didn't create
SRC_ROOT.  I can put back to before if you'd prefer.

The other issue I realized was that by defining SRC_ROOT in my fyi_tester.sh
script, I could affect the individual test functions.

   if [[ -f "$script" ]]; then
     "$script"
   else
     echo "Cannot find $script; why?"
   fi
 }
 
 # Function to force-green a bot.
 function bb_force_bot_green_and_exit {
   echo "@@@BUILD_STEP Bot forced green.@@@"
   exit 0
 }
 
 # Basic setup for all bots to run after a source tree checkout.
 # $1: source root.
 function bb_baseline_setup {
   echo "@@@BUILD_STEP cd into source root@@@"
-  SRC_ROOT="$1"
+  export SRC_ROOT=${1-$SRC_ROOT}

[John Grabowski, 2012/06/18 18:20:04]

ditto

   if [ ! -d "${SRC_ROOT}" ] ; then
     echo "Please specify a valid source root directory as an arg"
     echo '@@@STEP_FAILURE@@@'
     return 1
   fi
   cd $SRC_ROOT
 
   if [ ! -f build/android/envsetup.sh ] ; then
     echo "No envsetup.sh"
     echo "@@@STEP_FAILURE@@@"
@@ skipping 172 matching lines @@
 function bb_run_tests {
   echo "@@@BUILD_STEP Run Tests on actual hardware@@@"
   build/android/run_tests.py --xvfb --verbose
 }
 
 # Run APK tests on an actual device.
 function bb_run_apk_tests {
   echo "@@@BUILD_STEP Run APK Tests on actual hardware@@@"
   build/android/run_tests.py --xvfb --verbose --apk=True
 }
+
+# Zip and archive a build
+function bb_zip_build {
+  echo "@@@BUILD_STEP Zip build@@@"
+  python ../../../../scripts/slave/zip_build.py
+}
+
+# Download and extract a build
+function bb_extract_build {
+  echo "@@@BUILD_STEP Download and extract build@@@"
+  python ../../../../scripts/slave/extract_build.py \
+    --no-append-dir \
+    --build-dir out \
+    --target Release \
+    --build-url "$BUILDBOT_BUILD_URL"
+}