commit 05a55785586a5847a98d90846a59b5fa48c659d0
author Dan Shi <dshi@google.com> Sun May 28 08:00:02 2017 +0000
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Mon Aug 07 22:51:23 2017 +0000
tree 40de30fe1445489780678914164169f72e76756e
parent ce6e2e961f6f208919b9293438c27391c55d4955

Revert "[autotest] move gs_offloader to use the chromite version of gsutil"

BUG=b:62157091
TEST=none

This reverts commit 82ad4501ac5d0fca275b4c370231f1c214da7922.

Change-Id: I597dac6b8b2523eee3cf54f7e352afddb5393644
Reviewed-on: https://chromium-review.googlesource.com/517398
Trybot-Ready: Dan Shi <dshi@google.com>
Reviewed-by: Dan Shi <dshi@google.com>
Commit-Queue: Dan Shi <dshi@google.com>
Tested-by: Dan Shi <dshi@google.com>
(cherry picked from commit 365049f691c80802030f62cf2fce345bb670e00d)
Reviewed-on: https://chromium-review.googlesource.com/604512
Reviewed-by: Keith Haddow <haddowk@chromium.org>
Commit-Queue: Keith Haddow <haddowk@chromium.org>
Tested-by: Keith Haddow <haddowk@chromium.org>

site_utils/gs_offloader.py

diff --git a/site_utils/gs_offloader.py b/site_utils/gs_offloader.py
index b6f8c5f..fd2ecbd 100755
--- a/site_utils/gs_offloader.py
+++ b/site_utils/gs_offloader.py
@@ -39,7 +39,6 @@
 from autotest_lib.site_utils import pubsub_utils
 from autotest_lib.tko import models
 from autotest_lib.utils import labellib
-from chromite.lib import gs
 
 # Autotest requires the psutil module from site-packages, so it must be imported
 # after "import common".
@@ -144,9 +143,6 @@
 # the message data for new test result notification.
 NEW_TEST_RESULT_MESSAGE = 'NEW_TEST_RESULT'
 
-# Full path to the correct gsutil command to run.
-_GSUTIL_CMD = gs.GSContext.GetDefaultGSUtilBin()
-
 # metadata type
 GS_OFFLOADER_SUCCESS_TYPE = 'gs_offloader_success'
 GS_OFFLOADER_FAILURE_TYPE = 'gs_offloader_failure'
@@ -226,7 +222,7 @@
 
     @return A command list to be executed by Popen.
     """
-    cmd = [_GSUTIL_CMD]
+    cmd = ['gsutil']
     if multiprocessing:
         cmd.append('-m')
     if USE_RSYNC_ENABLED:
@@ -733,7 +729,7 @@
         try:
             subprocess.check_call(test_cmd)
             subprocess.check_call(
-                    [_GSUTIL_CMD, 'rm',
+                    ['gsutil', 'rm',
                      os.path.join(gs_uri,
                                   os.path.basename(dummy_file.name))])
             break

site_utils/gs_offloader_unittest.py

diff --git a/site_utils/gs_offloader_unittest.py b/site_utils/gs_offloader_unittest.py
index 0731611..5ff1ac9 100755
--- a/site_utils/gs_offloader_unittest.py
+++ b/site_utils/gs_offloader_unittest.py
@@ -388,7 +388,7 @@
                 multi, job.queue_args[0],
                 os.path.join(test_bucket_uri, job.queue_args[1]))
 
-        self.assertEqual(command[0], gs_offloader._GSUTIL_CMD)
+        self.assertEqual(command[0], 'gsutil')
         if multi:
             self.assertEqual(command[1], '-m')
         self.assertEqual(command[-2], job.queue_args[0])