commit 706c4144b52120479e9136375a119f09ebe70f36
author David James <davidjames@chromium.org> Thu Apr 18 10:47:17 2013 -0700
committer ChromeBot <chrome-bot@google.com> Fri Apr 19 10:41:27 2013 -0700
tree 344ed84d8e3788b22bba902808b9bf9a831882b0
parent 8d17ae3f25b7087cb735bd6c362ae7c3aad2d56c

Use GS wrapper to download from Google Storage.

This bug is blocking the Pre-CQ because we're seeing lots of failures
during remote trybot runs.

BUG=chromium:233226
TEST=Run it locally.
CQ-DEPEND=CL:48505
Change-Id: Iceb2bd970770735730254fe973cb914b5a1a9636
Reviewed-on: https://gerrit.chromium.org/gerrit/48533
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: David James <davidjames@chromium.org>
Tested-by: David James <davidjames@chromium.org>

sdk_lib/make_conf_util.sh

diff --git a/sdk_lib/make_conf_util.sh b/sdk_lib/make_conf_util.sh
index 990c156..6a65dae 100644
--- a/sdk_lib/make_conf_util.sh
+++ b/sdk_lib/make_conf_util.sh
@@ -60,7 +60,8 @@
   chromeos_overlay="$CHROOT_TRUNK_DIR/$chromeos_overlay"
   if [ -d "$chromeos_overlay" ]; then
     local boto_config="$chromeos_overlay/googlestorage_account.boto"
-    local gsutil_cmd='gsutil cp \"${URI}\" \"${DISTDIR}/${FILE}\"'
+    local gs_fetch_binpkg='/mnt/host/source/chromite/bin/gs_fetch_binpkg'
+    local gsutil_cmd=${gs_fetch_binpkg}' \"${URI}\" \"${DISTDIR}/${FILE}\"'
     cat <<EOF
 source $chromeos_overlay/make.conf
 

setup_board

diff --git a/setup_board b/setup_board
index 653612e..f07dfee 100755
--- a/setup_board
+++ b/setup_board
@@ -171,7 +171,8 @@
   if [[ -f "$chromeos_overlay/googlestorage_account.boto" ]]; then
     boto_config="$chromeos_overlay/googlestorage_account.boto"
   fi
-  local gsutil_cmd='gsutil cp \"${URI}\" \"${DISTDIR}/${FILE}\"'
+  local gs_fetch_binpkg='/mnt/host/source/chromite/bin/gs_fetch_binpkg'
+  local gsutil_cmd=${gs_fetch_binpkg}' \"${URI}\" \"${DISTDIR}/${FILE}\"'
   echo
   echo FETCHCOMMAND_GS="\"bash -c 'BOTO_CONFIG=$boto_config $gsutil_cmd'\""
   echo RESUMECOMMAND_GS='"$FETCHCOMMAND_GS"'