autotest: call query_task_by_tags properly.
BUG=chromium:950062
TEST=SWARMING_TASK_ID=436d0cc3a3db3d11 SWARMING_SERVER=https://chromeos-swarming.appspot.com LOGDOG_SERVER=luci-logdog.appspot.com ./bin/run_suite_skylab --board=eve --suite_name=ent-perbuild --build=eve-release/R75-12047.0.0 --priority 49 --timeout_mins 30 --test_retry --max_retries=5 --pre_check
Change-Id: I32b43883ecf50b899043904bdef7e101e3050d6a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/1554983
Reviewed-by: Alex Zamorzaev <zamorzaev@chromium.org>
Commit-Queue: Xixuan Wu <xixuan@chromium.org>
Tested-by: Xixuan Wu <xixuan@chromium.org>
diff --git a/venv/skylab_suite/cmd/run_suite_skylab.py b/venv/skylab_suite/cmd/run_suite_skylab.py
index 4b2ef82..c2fec5f 100755
--- a/venv/skylab_suite/cmd/run_suite_skylab.py
+++ b/venv/skylab_suite/cmd/run_suite_skylab.py
@@ -40,10 +40,10 @@
provision_num_required=provision_num_required)
-def _should_run(suite_spec):
+def _should_run(swarming_client, suite_spec):
tags = {'build': suite_spec.test_source_build,
'suite': suite_spec.suite_name}
- tasks = swarming_lib.query_task_by_tags(tags)
+ tasks = swarming_client.query_task_by_tags(tags)
current_task_id = suite_tracking.get_task_id_for_task_summaries(
os.environ.get('SWARMING_TASK_ID'))
logging.info('The current task id is: %s', current_task_id)
@@ -61,7 +61,7 @@
logging.info('Kicked off suite %s', options.suite_name)
suite_spec = suite_parser.parse_suite_spec(options)
if options.pre_check:
- extra_task_ids = _should_run(suite_spec)
+ extra_task_ids = _should_run(swarming_client, suite_spec)
if extra_task_ids:
logging.info(
'The same suites are already run in the past: \n%s',