Generate abi/revision no-dep control files for STS
STS requires checking ABI and Security Patch at runtime to select the
correct test. Therefore, we need control files that are not dependent on
ABI's or revisions of the test.
This CL makes the modifications on the control file generator for these
control files that are not dependent on abi / revision.
BUG=b:174188466
TEST=test_that
Change-Id: I62577dd8d6ef51576b1f0d1328da732eed3f0831
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2594613
Commit-Queue: Jiyoun Ha <jiyounha@chromium.org>
Commit-Queue: Kazuhiro Inaba <kinaba@chromium.org>
Tested-by: Jiyoun Ha <jiyounha@chromium.org>
Auto-Submit: Jiyoun Ha <jiyounha@chromium.org>
Reviewed-by: Kazuhiro Inaba <kinaba@chromium.org>
diff --git a/server/cros/tradefed/generate_controlfiles_common.py b/server/cros/tradefed/generate_controlfiles_common.py
index 5a4d78e..3b05ac4 100755
--- a/server/cros/tradefed/generate_controlfiles_common.py
+++ b/server/cros/tradefed/generate_controlfiles_common.py
@@ -197,6 +197,8 @@
In this case we chose to guess by filename, but we could also parse the
xml files in the module. (Maybe this needs to be done in the future.)
"""
+ if CONFIG.get('DYNAMIC_TEST_FETCH'):
+ return None
if filename.endswith('arm.zip'):
return 'arm'
if filename.endswith('arm64.zip'):
@@ -227,9 +229,9 @@
abi part is omitted.
"""
ext_parts = []
- if not is_public:
+ if not CONFIG.get('DYNAMIC_TEST_FETCH') and not is_public:
ext_parts = [revision]
- if abi:
+ if not CONFIG.get('DYNAMIC_TEST_FETCH') and abi:
ext_parts += [abi]
ext_parts += [module]
if led_provision:
