commit af016474ca726b994aaef8d5115da0fff55eb43a
author Aviv Keshet <akeshet@chromium.org> Thu Aug 01 13:36:36 2019 -0700
committer chrome-bot <chrome-bot@chromium.org> Mon Aug 05 13:30:55 2019 -0700
tree 70409eb0ff9108cb8bc5f98073fe383213109401
parent a965cd4f7b110cea8ea6afeda901c65a73ed7295

autotest: don't use buildbucket mode for any autotest skylab_tool calls

All the existing skylab_tool calls in the autotest repo are going to be
deprecated by cros_test_platform. But, in the meantime, they should be
overrided not to use cros_test_platform.

BUG=None
TEST=None

Change-Id: I3f46920f7d287ba8b081931181bb289e49f22802
Reviewed-on: https://chromium-review.googlesource.com/1731622
Tested-by: Aviv Keshet <akeshet@chromium.org>
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
Reviewed-by: Alex Zamorzaev <zamorzaev@chromium.org>

site_utils/run_suite.py

diff --git a/site_utils/run_suite.py b/site_utils/run_suite.py
index a2124dc..1670ccd 100755
--- a/site_utils/run_suite.py
+++ b/site_utils/run_suite.py
@@ -2176,7 +2176,7 @@
             if not override_pool else override_pool)
     paygen_tests = paygen.get_paygen_tests(test_source_build, options.name)
     for test in paygen_tests:
-        cmd = [skylab_tool, 'create-test']
+        cmd = [skylab_tool, 'create-test', '-bb=False']
         cmd += paygen.paygen_skylab_args(
                 test, options.name, test_source_build, pool, options.board,
                 options.model, options.timeout_mins,
@@ -2210,7 +2210,7 @@
     pool = override_pool or options.pool
     if options.mock_job_id:
         taskID = options.mock_job_id
-        cmd = [skylab_tool, 'wait-task',
+        cmd = [skylab_tool, 'wait-task', '-bb=False',
                '-timeout-mins', str(options.timeout_mins),
                '-service-account-json', _SKYLAB_SERVICE_ACCOUNT,
                taskID]
@@ -2229,7 +2229,7 @@
         _log_skylab_for_buildbot(task_stdout)
         return run_suite_common.SuiteResult(return_code)
     else:
-        cmd = [skylab_tool, 'create-suite',
+        cmd = [skylab_tool, 'create-suite', '-bb=False',
                '-board', options.board,
                '-image', builds[provision.CROS_VERSION_PREFIX],
                '-pool', pool,

venv/skylab_staging/test_push.py

diff --git a/venv/skylab_staging/test_push.py b/venv/skylab_staging/test_push.py
index 5f7799d..2488301 100644
--- a/venv/skylab_staging/test_push.py
+++ b/venv/skylab_staging/test_push.py
@@ -185,7 +185,7 @@
   """
   mins_remaining = int((deadline - time.time())/60)
   cmd = [
-    _skylab_tool(), 'create-suite',
+    _skylab_tool(), 'create-suite', '-bb=False',
     # test_push always runs in dev instance of skylab
     '-dev',
     '-board', dut_board,
@@ -202,7 +202,7 @@
   _logger.info('Triggered suite %s. Task id: %s', suite, task_id)
 
   cmd = [
-    _skylab_tool(), 'wait-task',
+    _skylab_tool(), 'wait-task', '-bb=False',
     '-dev',
     '-service-account-json', service_account_json,
     task_id

venv/skylab_suite/suite_utils.py

diff --git a/venv/skylab_suite/suite_utils.py b/venv/skylab_suite/suite_utils.py
index cf47e0f..3e8fa2f 100644
--- a/venv/skylab_suite/suite_utils.py
+++ b/venv/skylab_suite/suite_utils.py
@@ -85,7 +85,7 @@
     skylab_tool_path = os.environ.get('SKYLAB_TOOL', SKYLAB_TOOL)
 
     cmd = [
-        skylab_tool_path, 'create-test',
+        skylab_tool_path, 'create-test', '-bb=False',
         '-board', test_spec.board,
         '-image', test_spec.build,
         '-service-account-json', os.environ['SWARMING_CREDS'],