run_suite_skylab: pass execution timeout into `skylab create-test`
BUG=chromium:949328
TEST=None
Change-Id: Id742b3740bb26565d99a0edea9e5f57f5783986c
Reviewed-on: https://chromium-review.googlesource.com/1551964
Commit-Ready: Aviv Keshet <akeshet@chromium.org>
Tested-by: Aviv Keshet <akeshet@chromium.org>
Reviewed-by: Xixuan Wu <xixuan@chromium.org>
diff --git a/venv/skylab_suite/cros_suite.py b/venv/skylab_suite/cros_suite.py
index 55e93ca..856cd21 100644
--- a/venv/skylab_suite/cros_suite.py
+++ b/venv/skylab_suite/cros_suite.py
@@ -84,7 +84,7 @@
'dut_name',
'expiration_secs',
'grace_period_secs',
- 'execution_timeout_secs',
+ 'execution_timeout_mins',
'io_timeout_secs',
'quota_account',
])
@@ -373,7 +373,7 @@
keyvals=keyvals,
expiration_secs=self.timeout_mins * 60,
grace_period_secs=swarming_lib.DEFAULT_TIMEOUT_SECS,
- execution_timeout_secs=self.timeout_mins * 60,
+ execution_timeout_mins=self.timeout_mins,
io_timeout_secs=swarming_lib.DEFAULT_TIMEOUT_SECS,
quota_account=self.quota_account,
)
diff --git a/venv/skylab_suite/suite_runner.py b/venv/skylab_suite/suite_runner.py
index 808ccee..6d84030 100644
--- a/venv/skylab_suite/suite_runner.py
+++ b/venv/skylab_suite/suite_runner.py
@@ -173,6 +173,7 @@
'-board', test_spec.board,
'-image', test_spec.build,
'-service-account-json', os.environ['SWARMING_CREDS'],
+ '-timeout-mins', str(test_spec.execution_timeout_mins),
]
if _is_dev():
cmd += ['-dev']
@@ -190,6 +191,7 @@
if test_spec.test.test_type.lower() == 'client':
cmd += ['-client-test']
+
tags = _compute_tags(test_spec.build, suite_id)
dimensions = _compute_dimensions(
test_spec.bot_id, test_spec.test.dependencies)