cheets_CTS_P: Configure dynamic config retrieval per control file.
Identifying with the needs_media_push config was too rough.
BUG=b:150097753
BUG=b:149889853
TEST=cheets_CTS_P.9.0_r10.arm.CtsIntentSignatureTestCases
Change-Id: Iee361e372d1d190dab4f434bbacbc2e1ef4b8f3b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2072541
Reviewed-by: Kazuhiro Inaba <kinaba@chromium.org>
Commit-Queue: Kazuhiro Inaba <kinaba@chromium.org>
Tested-by: Kazuhiro Inaba <kinaba@chromium.org>
Auto-Submit: Kazuhiro Inaba <kinaba@chromium.org>
diff --git a/server/cros/tradefed/generate_controlfiles_CTS_P.py b/server/cros/tradefed/generate_controlfiles_CTS_P.py
index 4a6abab..4f22e63 100755
--- a/server/cros/tradefed/generate_controlfiles_CTS_P.py
+++ b/server/cros/tradefed/generate_controlfiles_CTS_P.py
@@ -182,6 +182,13 @@
CONFIG['NEEDS_PUSH_MEDIA'] = CONFIG['MEDIA_MODULES']
+# See b/149889853. Non-media test basically does not require dynamic
+# config. To reduce the flakiness, let us suppress the config.
+CONFIG['NEEDS_DYNAMIC_CONFIG_ON_COLLECTION'] = False
+CONFIG['NEEDS_DYNAMIC_CONFIG'] = CONFIG['MEDIA_MODULES'] + [
+ 'CtsIntentSignatureTestCases'
+]
+
# Modules that are known to need the default apps of Chrome (eg. Files.app).
CONFIG['ENABLE_DEFAULT_APPS'] = [
'CtsAppSecurityHostTestCases',
diff --git a/server/cros/tradefed/generate_controlfiles_common.py b/server/cros/tradefed/generate_controlfiles_common.py
index b094eff..4e3213c 100755
--- a/server/cros/tradefed/generate_controlfiles_common.py
+++ b/server/cros/tradefed/generate_controlfiles_common.py
@@ -524,6 +524,8 @@
for m in CONFIG['MEDIA_MODULES']:
cmd.append('--module-arg')
cmd.append('%s:skip-media-download:true' % m)
+ if not CONFIG.get('NEEDS_DYNAMIC_CONFIG_ON_COLLECTION', True):
+ cmd.append('--dynamic-config-url=')
return cmd
@@ -578,6 +580,11 @@
not (modules.intersection(CONFIG['BVT_ARC'] + CONFIG['SMOKE'] +
CONFIG['NEEDS_DEVICE_INFO']))):
cmd.append('--skip-device-info')
+ # If NEEDS_DYNAMIC_CONFIG is set, disable the feature except on the modules
+ # that explicitly set as needed.
+ if (CONFIG.get('NEEDS_DYNAMIC_CONFIG') and
+ not modules.intersection(CONFIG['NEEDS_DYNAMIC_CONFIG'])):
+ cmd.append('--dynamic-config-url=')
return cmd
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAbiOverrideHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAbiOverrideHostTestCases
index fe8f1d0..40e606b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAbiOverrideHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAbiOverrideHostTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsAbiOverrideHostTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsAbiOverrideHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAbiOverrideHostTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAbiOverrideHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsAbiOverrideHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAccelerationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAccelerationTestCases
index 157d74b..31541a2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAccelerationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAccelerationTestCases
@@ -6,7 +6,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_P.9.0_r10.arm.CtsAccelerationTestCases'
-ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:bvt-arc'
+ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
DEPENDENCIES = 'arc'
JOB_RETRIES = 1
TEST_TYPE = 'server'
@@ -23,8 +23,8 @@
max_retry=3,
tag='9.0_r10.arm.CtsAccelerationTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsAccelerationTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAccelerationTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAccelerationTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsAccelerationTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAccessibility b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAccessibility
index ecf9edf..067745b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAccessibility
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAccessibility
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsAccessibility',
test_name='cheets_CTS_P.9.0_r10.arm.CtsAccessibility',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAccessibilityServiceTestCases', '--include-filter', 'CtsAccessibilityTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAccessibilityServiceTestCases', '--include-filter', 'CtsAccessibilityTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsAccessibility',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAccountManagerTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAccountManagerTestCases
index 6bb98a9..062b9f4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAccountManagerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAccountManagerTestCases
@@ -23,8 +23,8 @@
max_retry=3,
tag='9.0_r10.arm.CtsAccountManagerTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsAccountManagerTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAccountManagerTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAccountManagerTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsAccountManagerTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsActivityManagerDevice b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsActivityManagerDevice
index 8ed0571..a27e44c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsActivityManagerDevice
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsActivityManagerDevice
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsActivityManagerDevice',
test_name='cheets_CTS_P.9.0_r10.arm.CtsActivityManagerDevice',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsActivityManagerDeviceSdk25TestCases', '--include-filter', 'CtsActivityManagerDeviceTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsActivityManagerDeviceSdk25TestCases', '--include-filter', 'CtsActivityManagerDeviceTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsActivityManagerDevice',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAdmin b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAdmin
index ea5e026..61aa3b2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAdmin
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAdmin
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsAdmin',
test_name='cheets_CTS_P.9.0_r10.arm.CtsAdmin',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAdminPackageInstallerTestCases', '--include-filter', 'CtsAdminTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAdminPackageInstallerTestCases', '--include-filter', 'CtsAdminTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsAdmin',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAlarm b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAlarm
index 06ab5bf..006c1e1 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAlarm
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAlarm
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsAlarm',
test_name='cheets_CTS_P.9.0_r10.arm.CtsAlarm',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAlarmClockTestCases', '--include-filter', 'CtsAlarmManagerTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAlarmClockTestCases', '--include-filter', 'CtsAlarmManagerTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsAlarm',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAndroid b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAndroid
index 7776a36..e14a716 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAndroid
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAndroid
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsAndroid',
test_name='cheets_CTS_P.9.0_r10.arm.CtsAndroid',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAndroidAppTestCases', '--include-filter', 'CtsAndroidTestBase27ApiSignatureTestCases', '--include-filter', 'CtsAndroidTestMockCurrentApiSignatureTestCases', '--include-filter', 'CtsAndroidTestRunnerCurrentApiSignatureTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAndroidAppTestCases', '--include-filter', 'CtsAndroidTestBase27ApiSignatureTestCases', '--include-filter', 'CtsAndroidTestMockCurrentApiSignatureTestCases', '--include-filter', 'CtsAndroidTestRunnerCurrentApiSignatureTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsAndroid',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAnimationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAnimationTestCases
index 96196ad..baee07a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAnimationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAnimationTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsAnimationTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsAnimationTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAnimationTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAnimationTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsAnimationTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsApacheHttpLegacy b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsApacheHttpLegacy
index 702d3c1..3811923 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsApacheHttpLegacy
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsApacheHttpLegacy
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsApacheHttpLegacy',
test_name='cheets_CTS_P.9.0_r10.arm.CtsApacheHttpLegacy',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsApacheHttpLegacy27ApiSignatureTestCases', '--include-filter', 'CtsApacheHttpLegacyCurrentApiSignatureTestCases', '--include-filter', 'CtsApacheHttpLegacyUsesLibraryApiSignatureTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsApacheHttpLegacy27ApiSignatureTestCases', '--include-filter', 'CtsApacheHttpLegacyCurrentApiSignatureTestCases', '--include-filter', 'CtsApacheHttpLegacyUsesLibraryApiSignatureTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsApacheHttpLegacy',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsApp b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsApp
index 157ca8d..ef737d0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsApp
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsApp
@@ -23,8 +23,8 @@
enable_default_apps=True,
tag='9.0_r10.arm.CtsApp',
test_name='cheets_CTS_P.9.0_r10.arm.CtsApp',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAppComponentFactoryTestCases', '--include-filter', 'CtsAppSecurityHostTestCases', '--include-filter', 'CtsAppTestCases', '--include-filter', 'CtsAppUsageHostTestCases', '--include-filter', 'CtsAppWidgetTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAppComponentFactoryTestCases', '--include-filter', 'CtsAppSecurityHostTestCases', '--include-filter', 'CtsAppTestCases', '--include-filter', 'CtsAppUsageHostTestCases', '--include-filter', 'CtsAppWidgetTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsApp',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAslrMallocTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAslrMallocTestCases
index 98625a7..6f0c9cb 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAslrMallocTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAslrMallocTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsAslrMallocTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsAslrMallocTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAslrMallocTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAslrMallocTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsAslrMallocTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAssistTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAssistTestCases
index 2ff5f23..3619437 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAssistTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAssistTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsAssistTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsAssistTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAssistTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAssistTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsAssistTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAtraceHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAtraceHostTestCases
index 836503f..1ca7eda 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAtraceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAtraceHostTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsAtraceHostTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsAtraceHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAtraceHostTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAtraceHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsAtraceHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAutoFillServiceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAutoFillServiceTestCases
index 31f9812..f6880ad 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAutoFillServiceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsAutoFillServiceTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsAutoFillServiceTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsAutoFillServiceTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAutoFillServiceTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAutoFillServiceTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsAutoFillServiceTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsBackgroundRestrictionsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsBackgroundRestrictionsTestCases
index 3db2594..0f0879a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsBackgroundRestrictionsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsBackgroundRestrictionsTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsBackgroundRestrictionsTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsBackgroundRestrictionsTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsBackgroundRestrictionsTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsBackgroundRestrictionsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsBackgroundRestrictionsTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsBackup b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsBackup
index c6ab80e..2a23f8b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsBackup
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsBackup
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsBackup',
test_name='cheets_CTS_P.9.0_r10.arm.CtsBackup',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsBackupHostTestCases', '--include-filter', 'CtsBackupTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsBackupHostTestCases', '--include-filter', 'CtsBackupTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsBackup',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsBatterySavingTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsBatterySavingTestCases
index c17aab1..484fbc3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsBatterySavingTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsBatterySavingTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsBatterySavingTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsBatterySavingTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsBatterySavingTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsBatterySavingTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsBatterySavingTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsBionicTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsBionicTestCases
index 0803c97..a787b41 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsBionicTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsBionicTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsBionicTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsBionicTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsBionicTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsBionicTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsBionicTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsBluetoothTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsBluetoothTestCases
index fac6fac..33b9a74 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsBluetoothTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsBluetoothTestCases
@@ -35,8 +35,8 @@
iterations=1,
tag='9.0_r10.arm.CtsBluetoothTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsBluetoothTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsBluetoothTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsBluetoothTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsBluetoothTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsBootStatsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsBootStatsTestCases
index 5733276..cda930e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsBootStatsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsBootStatsTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsBootStatsTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsBootStatsTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsBootStatsTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsBootStatsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsBootStatsTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCalendarcommon2TestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCalendarcommon2TestCases
index bf2ad7d..279225d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCalendarcommon2TestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCalendarcommon2TestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsCalendarcommon2TestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsCalendarcommon2TestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCalendarcommon2TestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCalendarcommon2TestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsCalendarcommon2TestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCamera b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCamera
index 6c9fb8c..7116514 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCamera
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCamera
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsCamera',
test_name='cheets_CTS_P.9.0_r10.arm.CtsCamera',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraApi25TestCases', '--include-filter', 'CtsCameraTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraApi25TestCases', '--include-filter', 'CtsCameraTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsCamera',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCameraTestCases.camerabox.back b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCameraTestCases.camerabox.back
index 3f67a93..d23f9b5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCameraTestCases.camerabox.back
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCameraTestCases.camerabox.back
@@ -24,8 +24,8 @@
iterations=1,
tag='9.0_r10.arm.CtsCameraTestCases.camerabox.back',
test_name='cheets_CTS_P.9.0_r10.arm.CtsCameraTestCases.camerabox.back',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCameraTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCameraTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsCameraTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCameraTestCases.camerabox.front b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCameraTestCases.camerabox.front
index f9f15c1..ac11c83 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCameraTestCases.camerabox.front
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCameraTestCases.camerabox.front
@@ -24,8 +24,8 @@
iterations=1,
tag='9.0_r10.arm.CtsCameraTestCases.camerabox.front',
test_name='cheets_CTS_P.9.0_r10.arm.CtsCameraTestCases.camerabox.front',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCameraTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCameraTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsCameraTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCarTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCarTestCases
index 0a6c263..fde977e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCarTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCarTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsCarTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsCarTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCarTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCarTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsCarTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCarrierApiTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCarrierApiTestCases
index 730c3b2..21d007c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCarrierApiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCarrierApiTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsCarrierApiTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsCarrierApiTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCarrierApiTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCarrierApiTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsCarrierApiTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsColorModeTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsColorModeTestCases
index ff3a5e3..87e3452 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsColorModeTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsColorModeTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsColorModeTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsColorModeTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsColorModeTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsColorModeTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsColorModeTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCompilationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCompilationTestCases
index 7ac7126..9b05313 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCompilationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCompilationTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsCompilationTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsCompilationTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCompilationTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCompilationTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsCompilationTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsContactsProviderWipe b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsContactsProviderWipe
index 56a11f5..2215217 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsContactsProviderWipe
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsContactsProviderWipe
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsContactsProviderWipe',
test_name='cheets_CTS_P.9.0_r10.arm.CtsContactsProviderWipe',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsContactsProviderWipe', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsContactsProviderWipe', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsContactsProviderWipe',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsContentTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsContentTestCases
index 8d6aa6e..4114a96 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsContentTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsContentTestCases
@@ -23,8 +23,8 @@
enable_default_apps=True,
tag='9.0_r10.arm.CtsContentTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsContentTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsContentTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsContentTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsContentTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCppToolsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCppToolsTestCases
index 22e6c35..5bbdee5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCppToolsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCppToolsTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsCppToolsTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsCppToolsTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCppToolsTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCppToolsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsCppToolsTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCurrentApiSignatureTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCurrentApiSignatureTestCases
index e8350b8..d187489 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCurrentApiSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCurrentApiSignatureTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsCurrentApiSignatureTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsCurrentApiSignatureTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCurrentApiSignatureTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCurrentApiSignatureTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsCurrentApiSignatureTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDatabaseTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDatabaseTestCases
index 8ad3433..4093a77 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDatabaseTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDatabaseTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsDatabaseTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsDatabaseTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDatabaseTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDatabaseTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsDatabaseTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDebugTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDebugTestCases
index 1959c83..fa2451a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDebugTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDebugTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsDebugTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsDebugTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDebugTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDebugTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsDebugTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDeqpTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDeqpTestCases
index bbb709f..6a10884 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDeqpTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDeqpTestCases
@@ -23,8 +23,8 @@
max_retry=15,
tag='9.0_r10.arm.CtsDeqpTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsDeqpTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDeqpTestCases'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDeqpTestCases', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsDeqpTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDeqpTestCases.dEQP-EGL b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDeqpTestCases.dEQP-EGL
index 86469e8..7c07d95 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDeqpTestCases.dEQP-EGL
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDeqpTestCases.dEQP-EGL
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsDeqpTestCases.dEQP-EGL',
test_name='cheets_CTS_P.9.0_r10.arm.CtsDeqpTestCases.dEQP-EGL',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-EGL.*'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-EGL.*', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsDeqpTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDeqpTestCases.dEQP-GLES2 b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDeqpTestCases.dEQP-GLES2
index 4404342..3fc1a9c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDeqpTestCases.dEQP-GLES2
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDeqpTestCases.dEQP-GLES2
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsDeqpTestCases.dEQP-GLES2',
test_name='cheets_CTS_P.9.0_r10.arm.CtsDeqpTestCases.dEQP-GLES2',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES2.*'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES2.*', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsDeqpTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDeqpTestCases.dEQP-GLES3 b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDeqpTestCases.dEQP-GLES3
index 8791c40..988e714 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDeqpTestCases.dEQP-GLES3
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDeqpTestCases.dEQP-GLES3
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsDeqpTestCases.dEQP-GLES3',
test_name='cheets_CTS_P.9.0_r10.arm.CtsDeqpTestCases.dEQP-GLES3',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES3.*'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES3.*', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsDeqpTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDeqpTestCases.dEQP-GLES31 b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDeqpTestCases.dEQP-GLES31
index 6708879..e97ef90 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDeqpTestCases.dEQP-GLES31
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDeqpTestCases.dEQP-GLES31
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsDeqpTestCases.dEQP-GLES31',
test_name='cheets_CTS_P.9.0_r10.arm.CtsDeqpTestCases.dEQP-GLES31',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES31.*'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES31.*', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsDeqpTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDeqpTestCases.dEQP-VK b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDeqpTestCases.dEQP-VK
index 172d835..3ccb0c1 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDeqpTestCases.dEQP-VK
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDeqpTestCases.dEQP-VK
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsDeqpTestCases.dEQP-VK',
test_name='cheets_CTS_P.9.0_r10.arm.CtsDeqpTestCases.dEQP-VK',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-VK.*'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-VK.*', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsDeqpTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDevice b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDevice
index 7dbe698..0c2b6d3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDevice
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDevice
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsDevice',
test_name='cheets_CTS_P.9.0_r10.arm.CtsDevice',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeviceIdleHostTestCases', '--include-filter', 'CtsDevicePolicyManagerTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeviceIdleHostTestCases', '--include-filter', 'CtsDevicePolicyManagerTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsDevice',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDexMetadataHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDexMetadataHostTestCases
index 6f60a72..568f1f0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDexMetadataHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDexMetadataHostTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsDexMetadataHostTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsDexMetadataHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDexMetadataHostTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDexMetadataHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsDexMetadataHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDisplayTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDisplayTestCases
index 04d1755..8f84282 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDisplayTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDisplayTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsDisplayTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsDisplayTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDisplayTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDisplayTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsDisplayTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDpi b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDpi
index f5f5bfa..5055085 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDpi
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDpi
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsDpi',
test_name='cheets_CTS_P.9.0_r10.arm.CtsDpi',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDpiTestCases', '--include-filter', 'CtsDpiTestCases2', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDpiTestCases', '--include-filter', 'CtsDpiTestCases2', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsDpi',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDreamsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDreamsTestCases
index 175abce..e94189c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDreamsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDreamsTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsDreamsTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsDreamsTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDreamsTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDreamsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsDreamsTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDrmTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDrmTestCases
index 652c60f2..edbfeba 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDrmTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDrmTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsDrmTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsDrmTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDrmTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDrmTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsDrmTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDumpsysHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDumpsysHostTestCases
index 44a1430..94c6289 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDumpsysHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDumpsysHostTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsDumpsysHostTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsDumpsysHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDumpsysHostTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDumpsysHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsDumpsysHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDynamicLinkerTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDynamicLinkerTestCases
index 480caf0..f17f748 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDynamicLinkerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsDynamicLinkerTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsDynamicLinkerTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsDynamicLinkerTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDynamicLinkerTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDynamicLinkerTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsDynamicLinkerTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsEdiHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsEdiHostTestCases
index 10f5d1c..b5165df 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsEdiHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsEdiHostTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsEdiHostTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsEdiHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsEdiHostTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsEdiHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsEdiHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsEffectTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsEffectTestCases
index 06bc83c..9cb2c6c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsEffectTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsEffectTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsEffectTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsEffectTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsEffectTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsEffectTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsEffectTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsExternalS b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsExternalS
index 04c456d..c45442c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsExternalS
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsExternalS
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsExternalS',
test_name='cheets_CTS_P.9.0_r10.arm.CtsExternalS',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsExternalServiceTestCases', '--include-filter', 'CtsExternalSourcesTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsExternalServiceTestCases', '--include-filter', 'CtsExternalSourcesTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsExternalS',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsFileSystemTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsFileSystemTestCases
index 85ce26f..f53fc25 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsFileSystemTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsFileSystemTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsFileSystemTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsFileSystemTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsFileSystemTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsFileSystemTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsFileSystemTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsFragment b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsFragment
index b46f4a2..ca34a37 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsFragment
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsFragment
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsFragment',
test_name='cheets_CTS_P.9.0_r10.arm.CtsFragment',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsFragmentTestCases', '--include-filter', 'CtsFragmentTestCasesSdk26', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsFragmentTestCases', '--include-filter', 'CtsFragmentTestCasesSdk26', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsFragment',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsGestureTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsGestureTestCases
index 86ed143..5e0a2dd 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsGestureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsGestureTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsGestureTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsGestureTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsGestureTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsGestureTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsGestureTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsGpuToolsHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsGpuToolsHostTestCases
index 3609ad1..f53f38d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsGpuToolsHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsGpuToolsHostTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsGpuToolsHostTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsGpuToolsHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsGpuToolsHostTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsGpuToolsHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsGpuToolsHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsGraphicsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsGraphicsTestCases
index 862dfe6..5048035 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsGraphicsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsGraphicsTestCases
@@ -23,8 +23,8 @@
max_retry=3,
tag='9.0_r10.arm.CtsGraphicsTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsGraphicsTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsGraphicsTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsGraphicsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsGraphicsTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsHardwareTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsHardwareTestCases
index 3519de0..4285a02 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsHardwareTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsHardwareTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsHardwareTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsHardwareTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsHardwareTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsHardwareTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsHardwareTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsHarmfulAppWarningHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsHarmfulAppWarningHostTestCases
index 5a59a5a..29ef628 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsHarmfulAppWarningHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsHarmfulAppWarningHostTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsHarmfulAppWarningHostTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsHarmfulAppWarningHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsHarmfulAppWarningHostTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsHarmfulAppWarningHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsHarmfulAppWarningHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsHiddenApi b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsHiddenApi
index 472598f..ea4405b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsHiddenApi
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsHiddenApi
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsHiddenApi',
test_name='cheets_CTS_P.9.0_r10.arm.CtsHiddenApi',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHiddenApiBlacklistApi27TestCases', '--include-filter', 'CtsHiddenApiBlacklistCurrentApiTestCases', '--include-filter', 'CtsHiddenApiBlacklistDebugClassTestCases', '--include-filter', 'CtsHiddenApiKillswitchDebugClassTestCases', '--include-filter', 'CtsHiddenApiKillswitchWhitelistTestCases', '--include-filter', 'CtsHiddenApiKillswitchWildcardTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHiddenApiBlacklistApi27TestCases', '--include-filter', 'CtsHiddenApiBlacklistCurrentApiTestCases', '--include-filter', 'CtsHiddenApiBlacklistDebugClassTestCases', '--include-filter', 'CtsHiddenApiKillswitchDebugClassTestCases', '--include-filter', 'CtsHiddenApiKillswitchWhitelistTestCases', '--include-filter', 'CtsHiddenApiKillswitchWildcardTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsHiddenApi',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsHostTzDataTests b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsHostTzDataTests
index 39314a1..a9f072b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsHostTzDataTests
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsHostTzDataTests
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsHostTzDataTests',
test_name='cheets_CTS_P.9.0_r10.arm.CtsHostTzDataTests',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsHostTzDataTests', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsHostTzDataTests', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsHostTzDataTests',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsHostside b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsHostside
index aa175d7..a7cb9f2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsHostside
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsHostside
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsHostside',
test_name='cheets_CTS_P.9.0_r10.arm.CtsHostside',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHostsideNetworkTests', '--include-filter', 'CtsHostsideNumberBlockingTestCases', '--include-filter', 'CtsHostsideTvTests', '--include-filter', 'CtsHostsideWebViewTests', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHostsideNetworkTests', '--include-filter', 'CtsHostsideNumberBlockingTestCases', '--include-filter', 'CtsHostsideTvTests', '--include-filter', 'CtsHostsideWebViewTests', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsHostside',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsIcuTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsIcuTestCases
index ea741d7..9a31e3f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsIcuTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsIcuTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsIcuTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsIcuTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsIcuTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsIcuTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsIcuTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsIncidentHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsIncidentHostTestCases
index e8be001..c963dff 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsIncidentHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsIncidentHostTestCases
@@ -23,8 +23,8 @@
max_retry=30,
tag='9.0_r10.arm.CtsIncidentHostTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsIncidentHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsIncidentHostTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsIncidentHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsIncidentHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsInlineMockingTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsInlineMockingTestCases
index 24c9260..336cdc0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsInlineMockingTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsInlineMockingTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsInlineMockingTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsInlineMockingTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsInlineMockingTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsInlineMockingTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsInlineMockingTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsInputMethod b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsInputMethod
index 1d6a17b..c13550b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsInputMethod
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsInputMethod
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsInputMethod',
test_name='cheets_CTS_P.9.0_r10.arm.CtsInputMethod',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsInputMethodServiceHostTestCases', '--include-filter', 'CtsInputMethodTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsInputMethodServiceHostTestCases', '--include-filter', 'CtsInputMethodTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsInputMethod',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsJankDeviceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsJankDeviceTestCases
index 5081d0b..e91862b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsJankDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsJankDeviceTestCases
@@ -23,8 +23,8 @@
max_retry=3,
tag='9.0_r10.arm.CtsJankDeviceTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsJankDeviceTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsJankDeviceTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsJankDeviceTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsJankDeviceTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsJdwp b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsJdwp
index 6e29131..c381bd3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsJdwp
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsJdwp
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsJdwp',
test_name='cheets_CTS_P.9.0_r10.arm.CtsJdwp',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJdwpSecurityHostTestCases', '--include-filter', 'CtsJdwpTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJdwpSecurityHostTestCases', '--include-filter', 'CtsJdwpTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsJdwp',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsJniTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsJniTestCases
index 0bac3db..3761ca2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsJniTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsJniTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsJniTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsJniTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsJniTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsJniTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsJniTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsJobScheduler b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsJobScheduler
index 8aa7065..f85c721 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsJobScheduler
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsJobScheduler
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsJobScheduler',
test_name='cheets_CTS_P.9.0_r10.arm.CtsJobScheduler',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJobSchedulerSharedUidTestCases', '--include-filter', 'CtsJobSchedulerTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJobSchedulerSharedUidTestCases', '--include-filter', 'CtsJobSchedulerTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsJobScheduler',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsJvmti b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsJvmti
index 494235a..cb5f641 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsJvmti
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsJvmti
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsJvmti',
test_name='cheets_CTS_P.9.0_r10.arm.CtsJvmti',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiAttachingHostTestCases', '--include-filter', 'CtsJvmtiAttachingTestCases', '--include-filter', 'CtsJvmtiRedefineClassesHostTestCases', '--include-filter', 'CtsJvmtiRunTest1900HostTestCases', '--include-filter', 'CtsJvmtiRunTest1901HostTestCases', '--include-filter', 'CtsJvmtiRunTest1902HostTestCases', '--include-filter', 'CtsJvmtiRunTest1903HostTestCases', '--include-filter', 'CtsJvmtiRunTest1904HostTestCases', '--include-filter', 'CtsJvmtiRunTest1906HostTestCases', '--include-filter', 'CtsJvmtiRunTest1907HostTestCases', '--include-filter', 'CtsJvmtiRunTest1908HostTestCases', '--include-filter', 'CtsJvmtiRunTest1909HostTestCases', '--include-filter', 'CtsJvmtiRunTest1910HostTestCases', '--include-filter', 'CtsJvmtiRunTest1911HostTestCases', '--include-filter', 'CtsJvmtiRunTest1912HostTestCases', '--include-filter', 'CtsJvmtiRunTest1913HostTestCases', '--include-filter', 'CtsJvmtiRunTest1914HostTestCases', '--include-filter', 'CtsJvmtiRunTest1915HostTestCases', '--include-filter', 'CtsJvmtiRunTest1916HostTestCases', '--include-filter', 'CtsJvmtiRunTest1917HostTestCases', '--include-filter', 'CtsJvmtiRunTest1920HostTestCases', '--include-filter', 'CtsJvmtiRunTest1921HostTestCases', '--include-filter', 'CtsJvmtiRunTest1922HostTestCases', '--include-filter', 'CtsJvmtiRunTest1923HostTestCases', '--include-filter', 'CtsJvmtiRunTest1924HostTestCases', '--include-filter', 'CtsJvmtiRunTest1925HostTestCases', '--include-filter', 'CtsJvmtiRunTest1926HostTestCases', '--include-filter', 'CtsJvmtiRunTest1927HostTestCases', '--include-filter', 'CtsJvmtiRunTest1928HostTestCases', '--include-filter', 'CtsJvmtiRunTest1930HostTestCases', '--include-filter', 'CtsJvmtiRunTest1931HostTestCases', '--include-filter', 'CtsJvmtiRunTest1932HostTestCases', '--include-filter', 'CtsJvmtiRunTest1933HostTestCases', '--include-filter', 'CtsJvmtiRunTest1934HostTestCases', '--include-filter', 'CtsJvmtiRunTest1936HostTestCases', '--include-filter', 'CtsJvmtiRunTest1937HostTestCases', '--include-filter', 'CtsJvmtiRunTest1939HostTestCases', '--include-filter', 'CtsJvmtiRunTest1941HostTestCases', '--include-filter', 'CtsJvmtiRunTest1942HostTestCases', '--include-filter', 'CtsJvmtiRunTest1943HostTestCases', '--include-filter', 'CtsJvmtiRunTest902HostTestCases', '--include-filter', 'CtsJvmtiRunTest903HostTestCases', '--include-filter', 'CtsJvmtiRunTest904HostTestCases', '--include-filter', 'CtsJvmtiRunTest905HostTestCases', '--include-filter', 'CtsJvmtiRunTest906HostTestCases', '--include-filter', 'CtsJvmtiRunTest907HostTestCases', '--include-filter', 'CtsJvmtiRunTest908HostTestCases', '--include-filter', 'CtsJvmtiRunTest910HostTestCases', '--include-filter', 'CtsJvmtiRunTest911HostTestCases', '--include-filter', 'CtsJvmtiRunTest912HostTestCases', '--include-filter', 'CtsJvmtiRunTest913HostTestCases', '--include-filter', 'CtsJvmtiRunTest914HostTestCases', '--include-filter', 'CtsJvmtiRunTest915HostTestCases', '--include-filter', 'CtsJvmtiRunTest917HostTestCases', '--include-filter', 'CtsJvmtiRunTest918HostTestCases', '--include-filter', 'CtsJvmtiRunTest919HostTestCases', '--include-filter', 'CtsJvmtiRunTest920HostTestCases', '--include-filter', 'CtsJvmtiRunTest922HostTestCases', '--include-filter', 'CtsJvmtiRunTest923HostTestCases', '--include-filter', 'CtsJvmtiRunTest924HostTestCases', '--include-filter', 'CtsJvmtiRunTest926HostTestCases', '--include-filter', 'CtsJvmtiRunTest927HostTestCases', '--include-filter', 'CtsJvmtiRunTest928HostTestCases', '--include-filter', 'CtsJvmtiRunTest930HostTestCases', '--include-filter', 'CtsJvmtiRunTest931HostTestCases', '--include-filter', 'CtsJvmtiRunTest932HostTestCases', '--include-filter', 'CtsJvmtiRunTest940HostTestCases', '--include-filter', 'CtsJvmtiRunTest942HostTestCases', '--include-filter', 'CtsJvmtiRunTest944HostTestCases', '--include-filter', 'CtsJvmtiRunTest945HostTestCases', '--include-filter', 'CtsJvmtiRunTest947HostTestCases', '--include-filter', 'CtsJvmtiRunTest951HostTestCases', '--include-filter', 'CtsJvmtiRunTest982HostTestCases', '--include-filter', 'CtsJvmtiRunTest983HostTestCases', '--include-filter', 'CtsJvmtiRunTest984HostTestCases', '--include-filter', 'CtsJvmtiRunTest985HostTestCases', '--include-filter', 'CtsJvmtiRunTest986HostTestCases', '--include-filter', 'CtsJvmtiRunTest988HostTestCases', '--include-filter', 'CtsJvmtiRunTest989HostTestCases', '--include-filter', 'CtsJvmtiRunTest990HostTestCases', '--include-filter', 'CtsJvmtiRunTest991HostTestCases', '--include-filter', 'CtsJvmtiRunTest992HostTestCases', '--include-filter', 'CtsJvmtiRunTest993HostTestCases', '--include-filter', 'CtsJvmtiRunTest994HostTestCases', '--include-filter', 'CtsJvmtiRunTest995HostTestCases', '--include-filter', 'CtsJvmtiRunTest996HostTestCases', '--include-filter', 'CtsJvmtiRunTest997HostTestCases', '--include-filter', 'CtsJvmtiTaggingHostTestCases', '--include-filter', 'CtsJvmtiTrackingHostTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiAttachingHostTestCases', '--include-filter', 'CtsJvmtiAttachingTestCases', '--include-filter', 'CtsJvmtiRedefineClassesHostTestCases', '--include-filter', 'CtsJvmtiRunTest1900HostTestCases', '--include-filter', 'CtsJvmtiRunTest1901HostTestCases', '--include-filter', 'CtsJvmtiRunTest1902HostTestCases', '--include-filter', 'CtsJvmtiRunTest1903HostTestCases', '--include-filter', 'CtsJvmtiRunTest1904HostTestCases', '--include-filter', 'CtsJvmtiRunTest1906HostTestCases', '--include-filter', 'CtsJvmtiRunTest1907HostTestCases', '--include-filter', 'CtsJvmtiRunTest1908HostTestCases', '--include-filter', 'CtsJvmtiRunTest1909HostTestCases', '--include-filter', 'CtsJvmtiRunTest1910HostTestCases', '--include-filter', 'CtsJvmtiRunTest1911HostTestCases', '--include-filter', 'CtsJvmtiRunTest1912HostTestCases', '--include-filter', 'CtsJvmtiRunTest1913HostTestCases', '--include-filter', 'CtsJvmtiRunTest1914HostTestCases', '--include-filter', 'CtsJvmtiRunTest1915HostTestCases', '--include-filter', 'CtsJvmtiRunTest1916HostTestCases', '--include-filter', 'CtsJvmtiRunTest1917HostTestCases', '--include-filter', 'CtsJvmtiRunTest1920HostTestCases', '--include-filter', 'CtsJvmtiRunTest1921HostTestCases', '--include-filter', 'CtsJvmtiRunTest1922HostTestCases', '--include-filter', 'CtsJvmtiRunTest1923HostTestCases', '--include-filter', 'CtsJvmtiRunTest1924HostTestCases', '--include-filter', 'CtsJvmtiRunTest1925HostTestCases', '--include-filter', 'CtsJvmtiRunTest1926HostTestCases', '--include-filter', 'CtsJvmtiRunTest1927HostTestCases', '--include-filter', 'CtsJvmtiRunTest1928HostTestCases', '--include-filter', 'CtsJvmtiRunTest1930HostTestCases', '--include-filter', 'CtsJvmtiRunTest1931HostTestCases', '--include-filter', 'CtsJvmtiRunTest1932HostTestCases', '--include-filter', 'CtsJvmtiRunTest1933HostTestCases', '--include-filter', 'CtsJvmtiRunTest1934HostTestCases', '--include-filter', 'CtsJvmtiRunTest1936HostTestCases', '--include-filter', 'CtsJvmtiRunTest1937HostTestCases', '--include-filter', 'CtsJvmtiRunTest1939HostTestCases', '--include-filter', 'CtsJvmtiRunTest1941HostTestCases', '--include-filter', 'CtsJvmtiRunTest1942HostTestCases', '--include-filter', 'CtsJvmtiRunTest1943HostTestCases', '--include-filter', 'CtsJvmtiRunTest902HostTestCases', '--include-filter', 'CtsJvmtiRunTest903HostTestCases', '--include-filter', 'CtsJvmtiRunTest904HostTestCases', '--include-filter', 'CtsJvmtiRunTest905HostTestCases', '--include-filter', 'CtsJvmtiRunTest906HostTestCases', '--include-filter', 'CtsJvmtiRunTest907HostTestCases', '--include-filter', 'CtsJvmtiRunTest908HostTestCases', '--include-filter', 'CtsJvmtiRunTest910HostTestCases', '--include-filter', 'CtsJvmtiRunTest911HostTestCases', '--include-filter', 'CtsJvmtiRunTest912HostTestCases', '--include-filter', 'CtsJvmtiRunTest913HostTestCases', '--include-filter', 'CtsJvmtiRunTest914HostTestCases', '--include-filter', 'CtsJvmtiRunTest915HostTestCases', '--include-filter', 'CtsJvmtiRunTest917HostTestCases', '--include-filter', 'CtsJvmtiRunTest918HostTestCases', '--include-filter', 'CtsJvmtiRunTest919HostTestCases', '--include-filter', 'CtsJvmtiRunTest920HostTestCases', '--include-filter', 'CtsJvmtiRunTest922HostTestCases', '--include-filter', 'CtsJvmtiRunTest923HostTestCases', '--include-filter', 'CtsJvmtiRunTest924HostTestCases', '--include-filter', 'CtsJvmtiRunTest926HostTestCases', '--include-filter', 'CtsJvmtiRunTest927HostTestCases', '--include-filter', 'CtsJvmtiRunTest928HostTestCases', '--include-filter', 'CtsJvmtiRunTest930HostTestCases', '--include-filter', 'CtsJvmtiRunTest931HostTestCases', '--include-filter', 'CtsJvmtiRunTest932HostTestCases', '--include-filter', 'CtsJvmtiRunTest940HostTestCases', '--include-filter', 'CtsJvmtiRunTest942HostTestCases', '--include-filter', 'CtsJvmtiRunTest944HostTestCases', '--include-filter', 'CtsJvmtiRunTest945HostTestCases', '--include-filter', 'CtsJvmtiRunTest947HostTestCases', '--include-filter', 'CtsJvmtiRunTest951HostTestCases', '--include-filter', 'CtsJvmtiRunTest982HostTestCases', '--include-filter', 'CtsJvmtiRunTest983HostTestCases', '--include-filter', 'CtsJvmtiRunTest984HostTestCases', '--include-filter', 'CtsJvmtiRunTest985HostTestCases', '--include-filter', 'CtsJvmtiRunTest986HostTestCases', '--include-filter', 'CtsJvmtiRunTest988HostTestCases', '--include-filter', 'CtsJvmtiRunTest989HostTestCases', '--include-filter', 'CtsJvmtiRunTest990HostTestCases', '--include-filter', 'CtsJvmtiRunTest991HostTestCases', '--include-filter', 'CtsJvmtiRunTest992HostTestCases', '--include-filter', 'CtsJvmtiRunTest993HostTestCases', '--include-filter', 'CtsJvmtiRunTest994HostTestCases', '--include-filter', 'CtsJvmtiRunTest995HostTestCases', '--include-filter', 'CtsJvmtiRunTest996HostTestCases', '--include-filter', 'CtsJvmtiRunTest997HostTestCases', '--include-filter', 'CtsJvmtiTaggingHostTestCases', '--include-filter', 'CtsJvmtiTrackingHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsJvmti',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsKernelConfigTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsKernelConfigTestCases
index 325f944..4dea900 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsKernelConfigTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsKernelConfigTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsKernelConfigTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsKernelConfigTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsKernelConfigTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsKernelConfigTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsKernelConfigTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsKeystoreTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsKeystoreTestCases
index d0c7bcb..c6bb698 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsKeystoreTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsKeystoreTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsKeystoreTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsKeystoreTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsKeystoreTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsKeystoreTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsKeystoreTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsLeanbackJankTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsLeanbackJankTestCases
index be9ac42..59b0eb4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsLeanbackJankTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsLeanbackJankTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsLeanbackJankTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsLeanbackJankTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsLeanbackJankTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsLeanbackJankTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsLeanbackJankTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsLegacyNotificationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsLegacyNotificationTestCases
index dc92dd0..623b9db 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsLegacyNotificationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsLegacyNotificationTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsLegacyNotificationTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsLegacyNotificationTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsLegacyNotificationTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsLegacyNotificationTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsLegacyNotificationTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsLibcore b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsLibcore
index 873c0a8..eacc7d8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsLibcore
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsLibcore
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsLibcore',
test_name='cheets_CTS_P.9.0_r10.arm.CtsLibcore',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLibcoreFileIOTestCases', '--include-filter', 'CtsLibcoreJsr166TestCases', '--include-filter', 'CtsLibcoreLegacy22TestCases', '--include-filter', 'CtsLibcoreOjTestCases', '--include-filter', 'CtsLibcoreOkHttpTestCases', '--include-filter', 'CtsLibcoreTestCases', '--include-filter', 'CtsLibcoreWycheproofBCTestCases', '--include-filter', 'CtsLibcoreWycheproofConscryptTestCases'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLibcoreFileIOTestCases', '--include-filter', 'CtsLibcoreJsr166TestCases', '--include-filter', 'CtsLibcoreLegacy22TestCases', '--include-filter', 'CtsLibcoreOjTestCases', '--include-filter', 'CtsLibcoreOkHttpTestCases', '--include-filter', 'CtsLibcoreTestCases', '--include-filter', 'CtsLibcoreWycheproofBCTestCases', '--include-filter', 'CtsLibcoreWycheproofConscryptTestCases', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsLibcore',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsLiblogTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsLiblogTestCases
index 81dab67..e14cb7b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsLiblogTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsLiblogTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsLiblogTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsLiblogTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsLiblogTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsLiblogTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsLiblogTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsLocation b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsLocation
index f69b991..0d567d8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsLocation
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsLocation
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsLocation',
test_name='cheets_CTS_P.9.0_r10.arm.CtsLocation',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLocation2TestCases', '--include-filter', 'CtsLocationTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLocation2TestCases', '--include-filter', 'CtsLocationTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsLocation',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsLogdTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsLogdTestCases
index 47e42a2..89ac693 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsLogdTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsLogdTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsLogdTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsLogdTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsLogdTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsLogdTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsLogdTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsMediaHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsMediaHostTestCases
index 490cc07..ca30ba3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsMediaHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsMediaHostTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsMediaHostTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsMediaHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaHostTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsMediaHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsMidiTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsMidiTestCases
index 3405568..6f8350b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsMidiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsMidiTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsMidiTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsMidiTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMidiTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMidiTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsMidiTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsMocking b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsMocking
index 97a8e71..51f7e09 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsMocking
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsMocking
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsMocking',
test_name='cheets_CTS_P.9.0_r10.arm.CtsMocking',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMockingDebuggableTestCases', '--include-filter', 'CtsMockingTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMockingDebuggableTestCases', '--include-filter', 'CtsMockingTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsMocking',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsMonkeyTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsMonkeyTestCases
index 7a3ea55..b3360ed 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsMonkeyTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsMonkeyTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsMonkeyTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsMonkeyTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMonkeyTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMonkeyTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsMonkeyTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsMultiUser b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsMultiUser
index 8193199..5f452ac 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsMultiUser
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsMultiUser
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsMultiUser',
test_name='cheets_CTS_P.9.0_r10.arm.CtsMultiUser',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMultiUserHostTestCases', '--include-filter', 'CtsMultiUserTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMultiUserHostTestCases', '--include-filter', 'CtsMultiUserTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsMultiUser',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsNNAPITestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsNNAPITestCases
index 77e8e2a..cfb4ab7 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsNNAPITestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsNNAPITestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsNNAPITestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsNNAPITestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsNNAPITestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsNNAPITestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsNNAPITestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsNative b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsNative
index 7b0ec17..f63c005 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsNative
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsNative
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsNative',
test_name='cheets_CTS_P.9.0_r10.arm.CtsNative',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNativeHardwareTestCases', '--include-filter', 'CtsNativeMediaAAudioTestCases', '--include-filter', 'CtsNativeMediaSlTestCases', '--include-filter', 'CtsNativeMediaXaTestCases', '--include-filter', 'CtsNativeNetTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNativeHardwareTestCases', '--include-filter', 'CtsNativeMediaAAudioTestCases', '--include-filter', 'CtsNativeMediaSlTestCases', '--include-filter', 'CtsNativeMediaXaTestCases', '--include-filter', 'CtsNativeNetTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsNative',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsNdefTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsNdefTestCases
index 6ab086e..c32b3c9 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsNdefTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsNdefTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsNdefTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsNdefTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsNdefTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsNdefTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsNdefTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsNet b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsNet
index 7b8f690..e5478e6 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsNet
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsNet
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsNet',
test_name='cheets_CTS_P.9.0_r10.arm.CtsNet',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecConfigAttributeTestCases', '--include-filter', 'CtsNetSecConfigBasicDebugDisabledTestCases', '--include-filter', 'CtsNetSecConfigBasicDebugEnabledTestCases', '--include-filter', 'CtsNetSecConfigBasicDomainConfigTestCases', '--include-filter', 'CtsNetSecConfigCleartextTrafficTestCases', '--include-filter', 'CtsNetSecConfigDownloadManagerTestCases', '--include-filter', 'CtsNetSecConfigInvalidPinTestCases', '--include-filter', 'CtsNetSecConfigNestedDomainConfigTestCases', '--include-filter', 'CtsNetSecConfigPrePCleartextTrafficTestCases', '--include-filter', 'CtsNetSecConfigResourcesSrcTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficFalseTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficTrueTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases', '--include-filter', 'CtsNetTestCases', '--include-filter', 'CtsNetTestCasesLegacyApi22', '--include-filter', 'CtsNetTestCasesLegacyPermission22', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecConfigAttributeTestCases', '--include-filter', 'CtsNetSecConfigBasicDebugDisabledTestCases', '--include-filter', 'CtsNetSecConfigBasicDebugEnabledTestCases', '--include-filter', 'CtsNetSecConfigBasicDomainConfigTestCases', '--include-filter', 'CtsNetSecConfigCleartextTrafficTestCases', '--include-filter', 'CtsNetSecConfigDownloadManagerTestCases', '--include-filter', 'CtsNetSecConfigInvalidPinTestCases', '--include-filter', 'CtsNetSecConfigNestedDomainConfigTestCases', '--include-filter', 'CtsNetSecConfigPrePCleartextTrafficTestCases', '--include-filter', 'CtsNetSecConfigResourcesSrcTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficFalseTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficTrueTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases', '--include-filter', 'CtsNetTestCases', '--include-filter', 'CtsNetTestCasesLegacyApi22', '--include-filter', 'CtsNetTestCasesLegacyPermission22', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsNet',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsOmapiTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsOmapiTestCases
index ce5a44f..5ea6a38 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsOmapiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsOmapiTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsOmapiTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsOmapiTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsOmapiTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsOmapiTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsOmapiTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsOpenG b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsOpenG
index 3d460e2..9af2564 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsOpenG
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsOpenG
@@ -23,8 +23,8 @@
max_retry=3,
tag='9.0_r10.arm.CtsOpenG',
test_name='cheets_CTS_P.9.0_r10.arm.CtsOpenG',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsOpenGLTestCases', '--include-filter', 'CtsOpenGlPerf2TestCases', '--include-filter', 'CtsOpenGlPerfTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsOpenGLTestCases', '--include-filter', 'CtsOpenGlPerf2TestCases', '--include-filter', 'CtsOpenGlPerfTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsOpenG',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsOs b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsOs
index 10f5081..33d847e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsOs
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsOs
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsOs',
test_name='cheets_CTS_P.9.0_r10.arm.CtsOs',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsOsHostTestCases', '--include-filter', 'CtsOsTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsOsHostTestCases', '--include-filter', 'CtsOsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsOs',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsPdfTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsPdfTestCases
index d65d4c6..d9b89ae 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsPdfTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsPdfTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsPdfTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsPdfTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsPdfTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsPdfTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsPdfTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsPerfettoTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsPerfettoTestCases
index 65fd9b2..bf75224 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsPerfettoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsPerfettoTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsPerfettoTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsPerfettoTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsPerfettoTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsPerfettoTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsPerfettoTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsPermission b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsPermission
index 082dd52..c18f208 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsPermission
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsPermission
@@ -23,8 +23,8 @@
max_retry=3,
tag='9.0_r10.arm.CtsPermission',
test_name='cheets_CTS_P.9.0_r10.arm.CtsPermission',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPermission2TestCases', '--include-filter', 'CtsPermissionTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPermission2TestCases', '--include-filter', 'CtsPermissionTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsPermission',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsPreference b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsPreference
index cc54919..f1b4e5b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsPreference
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsPreference
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsPreference',
test_name='cheets_CTS_P.9.0_r10.arm.CtsPreference',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPreference2TestCases', '--include-filter', 'CtsPreferenceTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPreference2TestCases', '--include-filter', 'CtsPreferenceTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsPreference',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsPrintTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsPrintTestCases
index 3efd02b..162a197 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsPrintTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsPrintTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsPrintTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsPrintTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsPrintTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsPrintTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsPrintTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsProtoTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsProtoTestCases
index 08964bb..3eed180 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsProtoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsProtoTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsProtoTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsProtoTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsProtoTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsProtoTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsProtoTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsProviderTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsProviderTestCases
index d7a5a2a..bdcba73 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsProviderTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsProviderTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsProviderTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsProviderTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsProviderTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsProviderTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsProviderTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsRenderscript b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsRenderscript
index f9c9cb6..3daaddf 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsRenderscript
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsRenderscript
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsRenderscript',
test_name='cheets_CTS_P.9.0_r10.arm.CtsRenderscript',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsRenderscriptLegacyTestCases', '--include-filter', 'CtsRenderscriptTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsRenderscriptLegacyTestCases', '--include-filter', 'CtsRenderscriptTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsRenderscript',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsRs b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsRs
index 79a2986..a4e47d5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsRs
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsRs
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsRs',
test_name='cheets_CTS_P.9.0_r10.arm.CtsRs',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsRsBlasTestCases', '--include-filter', 'CtsRsCppTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsRsBlasTestCases', '--include-filter', 'CtsRsCppTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsRs',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSample b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSample
index 8a8d551..b644a48 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSample
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSample
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsSample',
test_name='cheets_CTS_P.9.0_r10.arm.CtsSample',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSampleDeviceTestCases', '--include-filter', 'CtsSampleHostTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSampleDeviceTestCases', '--include-filter', 'CtsSampleHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsSample',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSaxTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSaxTestCases
index 34e926e..879dba2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSaxTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSaxTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsSaxTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsSaxTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSaxTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSaxTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsSaxTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSeccompHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSeccompHostTestCases
index 8876784..0c399ea 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSeccompHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSeccompHostTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsSeccompHostTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsSeccompHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSeccompHostTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSeccompHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsSeccompHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSecureElementAccessControl b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSecureElementAccessControl
index 95ca47f..005630e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSecureElementAccessControl
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSecureElementAccessControl
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsSecureElementAccessControl',
test_name='cheets_CTS_P.9.0_r10.arm.CtsSecureElementAccessControl',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecureElementAccessControlTestCases1', '--include-filter', 'CtsSecureElementAccessControlTestCases2', '--include-filter', 'CtsSecureElementAccessControlTestCases3', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecureElementAccessControlTestCases1', '--include-filter', 'CtsSecureElementAccessControlTestCases2', '--include-filter', 'CtsSecureElementAccessControlTestCases3', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsSecureElementAccessControl',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSecurity b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSecurity
index a84e194..2e151ac 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSecurity
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSecurity
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsSecurity',
test_name='cheets_CTS_P.9.0_r10.arm.CtsSecurity',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecurityBulletinHostTestCases', '--include-filter', 'CtsSecurityHostTestCases', '--include-filter', 'CtsSecurityTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecurityBulletinHostTestCases', '--include-filter', 'CtsSecurityHostTestCases', '--include-filter', 'CtsSecurityTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsSecurity',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSelinuxTargetSdk b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSelinuxTargetSdk
index a23e934..4717df4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSelinuxTargetSdk
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSelinuxTargetSdk
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsSelinuxTargetSdk',
test_name='cheets_CTS_P.9.0_r10.arm.CtsSelinuxTargetSdk',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSelinuxTargetSdk25TestCases', '--include-filter', 'CtsSelinuxTargetSdk27TestCases', '--include-filter', 'CtsSelinuxTargetSdkCurrentTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSelinuxTargetSdk25TestCases', '--include-filter', 'CtsSelinuxTargetSdk27TestCases', '--include-filter', 'CtsSelinuxTargetSdkCurrentTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsSelinuxTargetSdk',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSensorTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSensorTestCases
index cb044e0..a9feda9 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSensorTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSensorTestCases
@@ -23,8 +23,8 @@
max_retry=30,
tag='9.0_r10.arm.CtsSensorTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsSensorTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSensorTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSensorTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsSensorTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsShortcut b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsShortcut
index 2d2b495..c64a261 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsShortcut
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsShortcut
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsShortcut',
test_name='cheets_CTS_P.9.0_r10.arm.CtsShortcut',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsShortcutHostTestCases', '--include-filter', 'CtsShortcutManagerTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsShortcutHostTestCases', '--include-filter', 'CtsShortcutManagerTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsShortcut',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSimRestrictedApisTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSimRestrictedApisTestCases
index 69e2513..0eb6a93 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSimRestrictedApisTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSimRestrictedApisTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsSimRestrictedApisTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsSimRestrictedApisTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSimRestrictedApisTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSimRestrictedApisTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsSimRestrictedApisTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSimpleCpuTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSimpleCpuTestCases
index 619d7a9..148f371 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSimpleCpuTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSimpleCpuTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsSimpleCpuTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsSimpleCpuTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSimpleCpuTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSimpleCpuTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsSimpleCpuTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSimpleperfTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSimpleperfTestCases
index ccae0b4..6779308 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSimpleperfTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSimpleperfTestCases
@@ -23,8 +23,8 @@
max_retry=3,
tag='9.0_r10.arm.CtsSimpleperfTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsSimpleperfTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSimpleperfTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSimpleperfTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsSimpleperfTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSkQPTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSkQPTestCases
index e1ce1ef..dc9db94 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSkQPTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSkQPTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsSkQPTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsSkQPTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSkQPTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSkQPTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsSkQPTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSliceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSliceTestCases
index 81ef2e5..99403c1 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSliceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSliceTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsSliceTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsSliceTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSliceTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSliceTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsSliceTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSpeechTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSpeechTestCases
index d55a7c9..8937d45 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSpeechTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSpeechTestCases
@@ -23,8 +23,8 @@
max_retry=3,
tag='9.0_r10.arm.CtsSpeechTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsSpeechTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSpeechTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSpeechTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsSpeechTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsStatsdHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsStatsdHostTestCases
index 2526bfa..4525d1b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsStatsdHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsStatsdHostTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsStatsdHostTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsStatsdHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsStatsdHostTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsStatsdHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsStatsdHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSustainedPerformanceHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSustainedPerformanceHostTestCases
index a25f186..dd8d123 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSustainedPerformanceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSustainedPerformanceHostTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsSustainedPerformanceHostTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsSustainedPerformanceHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSustainedPerformanceHostTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSustainedPerformanceHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsSustainedPerformanceHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSync b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSync
index 68e76e7..14b903c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSync
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSync
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsSync',
test_name='cheets_CTS_P.9.0_r10.arm.CtsSync',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSyncAccountAccessOtherCertTestCases', '--include-filter', 'CtsSyncContentHostTestCases', '--include-filter', 'CtsSyncManagerTestsCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSyncAccountAccessOtherCertTestCases', '--include-filter', 'CtsSyncContentHostTestCases', '--include-filter', 'CtsSyncManagerTestsCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsSync',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSystem b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSystem
index b664a04..32c65e0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSystem
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsSystem
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsSystem',
test_name='cheets_CTS_P.9.0_r10.arm.CtsSystem',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSystemApiAnnotationTestCases', '--include-filter', 'CtsSystemApiSignatureTestCases', '--include-filter', 'CtsSystemIntentTestCases', '--include-filter', 'CtsSystemUiHostTestCases', '--include-filter', 'CtsSystemUiTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSystemApiAnnotationTestCases', '--include-filter', 'CtsSystemApiSignatureTestCases', '--include-filter', 'CtsSystemIntentTestCases', '--include-filter', 'CtsSystemUiHostTestCases', '--include-filter', 'CtsSystemUiTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsSystem',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsTelecom b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsTelecom
index 408ace4..2add0f0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsTelecom
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsTelecom
@@ -23,8 +23,8 @@
max_retry=3,
tag='9.0_r10.arm.CtsTelecom',
test_name='cheets_CTS_P.9.0_r10.arm.CtsTelecom',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTelecomTestCases', '--include-filter', 'CtsTelecomTestCases2', '--include-filter', 'CtsTelecomTestCases3', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTelecomTestCases', '--include-filter', 'CtsTelecomTestCases2', '--include-filter', 'CtsTelecomTestCases3', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsTelecom',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsTelephony b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsTelephony
index 1432c52..a22a6b8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsTelephony
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsTelephony
@@ -23,8 +23,8 @@
max_retry=3,
tag='9.0_r10.arm.CtsTelephony',
test_name='cheets_CTS_P.9.0_r10.arm.CtsTelephony',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTelephony2TestCases', '--include-filter', 'CtsTelephonyTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTelephony2TestCases', '--include-filter', 'CtsTelephonyTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsTelephony',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsTextTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsTextTestCases
index 3e3d7c3..3a997c0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsTextTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsTextTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsTextTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsTextTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsTextTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsTextTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsTextTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsTheme b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsTheme
index 52363ca..eb443af 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsTheme
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsTheme
@@ -23,8 +23,8 @@
max_retry=3,
tag='9.0_r10.arm.CtsTheme',
test_name='cheets_CTS_P.9.0_r10.arm.CtsTheme',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsThemeDeviceTestCases', '--include-filter', 'CtsThemeHostTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsThemeDeviceTestCases', '--include-filter', 'CtsThemeHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsTheme',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsToast b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsToast
index ea48386..ed2ed1a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsToast
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsToast
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsToast',
test_name='cheets_CTS_P.9.0_r10.arm.CtsToast',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsToastLegacyTestCases', '--include-filter', 'CtsToastTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsToastLegacyTestCases', '--include-filter', 'CtsToastTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsToast',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsTransitionTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsTransitionTestCases
index 64e9cb9..acb7567 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsTransitionTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsTransitionTestCases
@@ -23,8 +23,8 @@
max_retry=3,
tag='9.0_r10.arm.CtsTransitionTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsTransitionTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsTransitionTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsTransitionTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsTransitionTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsTrustedVoiceHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsTrustedVoiceHostTestCases
index 2280951..043a2ae 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsTrustedVoiceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsTrustedVoiceHostTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsTrustedVoiceHostTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsTrustedVoiceHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsTrustedVoiceHostTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsTrustedVoiceHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsTrustedVoiceHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsTv b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsTv
index f348332..0b2ab32 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsTv
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsTv
@@ -23,8 +23,8 @@
max_retry=3,
tag='9.0_r10.arm.CtsTv',
test_name='cheets_CTS_P.9.0_r10.arm.CtsTv',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTvProviderTestCases', '--include-filter', 'CtsTvTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTvProviderTestCases', '--include-filter', 'CtsTvTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsTv',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsUi b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsUi
index 7bba934..be6c43e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsUi
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsUi
@@ -23,8 +23,8 @@
max_retry=3,
tag='9.0_r10.arm.CtsUi',
test_name='cheets_CTS_P.9.0_r10.arm.CtsUi',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUiAutomationTestCases', '--include-filter', 'CtsUiDeviceTestCases', '--include-filter', 'CtsUiRenderingTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUiAutomationTestCases', '--include-filter', 'CtsUiDeviceTestCases', '--include-filter', 'CtsUiRenderingTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsUi',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsUidIsolationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsUidIsolationTestCases
index ddc8a41..4bd5ef5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsUidIsolationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsUidIsolationTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsUidIsolationTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsUidIsolationTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsUidIsolationTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsUidIsolationTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsUidIsolationTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsUsageStatsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsUsageStatsTestCases
index 072e211..860d258 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsUsageStatsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsUsageStatsTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsUsageStatsTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsUsageStatsTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsUsageStatsTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsUsageStatsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsUsageStatsTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsUsbTests b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsUsbTests
index f50f465..416b96e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsUsbTests
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsUsbTests
@@ -23,8 +23,8 @@
max_retry=3,
tag='9.0_r10.arm.CtsUsbTests',
test_name='cheets_CTS_P.9.0_r10.arm.CtsUsbTests',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsUsbTests', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsUsbTests', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsUsbTests',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsUtilTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsUtilTestCases
index f5d40bf..a7dd2d2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsUtilTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsUtilTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsUtilTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsUtilTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsUtilTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsUtilTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsUtilTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsVideoTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsVideoTestCases
index 608cb65..f5d1469 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsVideoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsVideoTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsVideoTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsVideoTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsVideoTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsVideoTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsVideoTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsViewTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsViewTestCases
index 68119ae..8735161 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsViewTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsViewTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsViewTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsViewTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsViewTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsViewTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsViewTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsVmTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsVmTestCases
index 3455808..6542a1b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsVmTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsVmTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsVmTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsVmTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsVmTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsVmTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsVmTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsVoice b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsVoice
index 3d2e3f0..2ffa611 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsVoice
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsVoice
@@ -23,8 +23,8 @@
max_retry=3,
tag='9.0_r10.arm.CtsVoice',
test_name='cheets_CTS_P.9.0_r10.arm.CtsVoice',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsVoiceInteractionTestCases', '--include-filter', 'CtsVoiceSettingsTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsVoiceInteractionTestCases', '--include-filter', 'CtsVoiceSettingsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsVoice',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsVrTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsVrTestCases
index b0b4755..8b07e1d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsVrTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsVrTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsVrTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsVrTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsVrTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsVrTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsVrTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsWebkitTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsWebkitTestCases
index d061a64..4d00684 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsWebkitTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsWebkitTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsWebkitTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsWebkitTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsWebkitTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsWebkitTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsWebkitTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsWidgetTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsWidgetTestCases
index 7734f3c..f123c4c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsWidgetTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsWidgetTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsWidgetTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsWidgetTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsWidgetTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsWidgetTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsWidgetTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsWindowManagerDeviceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsWindowManagerDeviceTestCases
index 7e89b99..3b19593 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsWindowManagerDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsWindowManagerDeviceTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsWindowManagerDeviceTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.CtsWindowManagerDeviceTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsWindowManagerDeviceTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsWindowManagerDeviceTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsWindowManagerDeviceTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsWrap b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsWrap
index 67d845a..b621dab 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsWrap
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsWrap
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.CtsWrap',
test_name='cheets_CTS_P.9.0_r10.arm.CtsWrap',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsWrapNoWrapTestCases', '--include-filter', 'CtsWrapWrapDebugMallocDebugTestCases', '--include-filter', 'CtsWrapWrapDebugTestCases', '--include-filter', 'CtsWrapWrapNoDebugTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsWrapNoWrapTestCases', '--include-filter', 'CtsWrapWrapDebugMallocDebugTestCases', '--include-filter', 'CtsWrapWrapDebugTestCases', '--include-filter', 'CtsWrapWrapNoDebugTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsWrap',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases
index e6ee347..bd97696 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases
@@ -23,8 +23,8 @@
max_retry=9,
tag='9.0_r10.arm.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAbiOverrideHostTestCases', '--include-filter', 'CtsAccelerationTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAbiOverrideHostTestCases', '--include-filter', 'CtsAccelerationTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases
index f62d75b..d1157a9 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases
@@ -23,8 +23,8 @@
max_retry=9,
tag='9.0_r10.arm.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAccessibilityServiceTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAccessibilityServiceTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases
index 8a97f7b..ef974bc 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases
@@ -23,8 +23,8 @@
max_retry=9,
tag='9.0_r10.arm.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAccessibilityTestCases', '--include-filter', 'CtsAccountManagerTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAccessibilityTestCases', '--include-filter', 'CtsAccountManagerTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases
index a4c972a..efb929b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases
@@ -23,8 +23,8 @@
max_retry=9,
tag='9.0_r10.arm.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsActivityManagerDeviceSdk25TestCases', '--include-filter', 'CtsActivityManagerDeviceTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsActivityManagerDeviceSdk25TestCases', '--include-filter', 'CtsActivityManagerDeviceTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases
index 8e358be..07e7e4b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases
@@ -24,8 +24,8 @@
enable_default_apps=True,
tag='9.0_r10.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAdminPackageInstallerTestCases', '--include-filter', 'CtsAdminTestCases', '--include-filter', 'CtsAlarmClockTestCases', '--include-filter', 'CtsAlarmManagerTestCases', '--include-filter', 'CtsAndroidAppTestCases', '--include-filter', 'CtsAndroidTestBase27ApiSignatureTestCases', '--include-filter', 'CtsAndroidTestMockCurrentApiSignatureTestCases', '--include-filter', 'CtsAndroidTestRunnerCurrentApiSignatureTestCases', '--include-filter', 'CtsAnimationTestCases', '--include-filter', 'CtsApacheHttpLegacy27ApiSignatureTestCases', '--include-filter', 'CtsApacheHttpLegacyCurrentApiSignatureTestCases', '--include-filter', 'CtsApacheHttpLegacyUsesLibraryApiSignatureTestCases', '--include-filter', 'CtsAppComponentFactoryTestCases', '--include-filter', 'CtsAppSecurityHostTestCases', '--include-filter', 'CtsAppTestCases', '--include-filter', 'CtsAppUsageHostTestCases', '--include-filter', 'CtsAppWidgetTestCases', '--include-filter', 'CtsAslrMallocTestCases', '--include-filter', 'CtsAssistTestCases', '--include-filter', 'CtsAtraceHostTestCases', '--include-filter', 'CtsAutoFillServiceTestCases', '--include-filter', 'CtsBackgroundRestrictionsTestCases', '--include-filter', 'CtsBackupHostTestCases', '--include-filter', 'CtsBackupTestCases', '--include-filter', 'CtsBatterySavingTestCases', '--include-filter', 'CtsBionicTestCases', '--include-filter', 'CtsBluetoothTestCases', '--include-filter', 'CtsBootStatsTestCases', '--include-filter', 'CtsCalendarcommon2TestCases', '--include-filter', 'CtsCameraApi25TestCases', '--include-filter', 'CtsCameraTestCases', '--include-filter', 'CtsCarTestCases', '--include-filter', 'CtsCarrierApiTestCases', '--include-filter', 'CtsColorModeTestCases', '--include-filter', 'CtsCompilationTestCases', '--include-filter', 'CtsContactsProviderWipe', '--include-filter', 'CtsContentTestCases', '--include-filter', 'CtsCppToolsTestCases', '--include-filter', 'CtsCurrentApiSignatureTestCases', '--include-filter', 'CtsDatabaseTestCases', '--include-filter', 'CtsDebugTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAdminPackageInstallerTestCases', '--include-filter', 'CtsAdminTestCases', '--include-filter', 'CtsAlarmClockTestCases', '--include-filter', 'CtsAlarmManagerTestCases', '--include-filter', 'CtsAndroidAppTestCases', '--include-filter', 'CtsAndroidTestBase27ApiSignatureTestCases', '--include-filter', 'CtsAndroidTestMockCurrentApiSignatureTestCases', '--include-filter', 'CtsAndroidTestRunnerCurrentApiSignatureTestCases', '--include-filter', 'CtsAnimationTestCases', '--include-filter', 'CtsApacheHttpLegacy27ApiSignatureTestCases', '--include-filter', 'CtsApacheHttpLegacyCurrentApiSignatureTestCases', '--include-filter', 'CtsApacheHttpLegacyUsesLibraryApiSignatureTestCases', '--include-filter', 'CtsAppComponentFactoryTestCases', '--include-filter', 'CtsAppSecurityHostTestCases', '--include-filter', 'CtsAppTestCases', '--include-filter', 'CtsAppUsageHostTestCases', '--include-filter', 'CtsAppWidgetTestCases', '--include-filter', 'CtsAslrMallocTestCases', '--include-filter', 'CtsAssistTestCases', '--include-filter', 'CtsAtraceHostTestCases', '--include-filter', 'CtsAutoFillServiceTestCases', '--include-filter', 'CtsBackgroundRestrictionsTestCases', '--include-filter', 'CtsBackupHostTestCases', '--include-filter', 'CtsBackupTestCases', '--include-filter', 'CtsBatterySavingTestCases', '--include-filter', 'CtsBionicTestCases', '--include-filter', 'CtsBluetoothTestCases', '--include-filter', 'CtsBootStatsTestCases', '--include-filter', 'CtsCalendarcommon2TestCases', '--include-filter', 'CtsCameraApi25TestCases', '--include-filter', 'CtsCameraTestCases', '--include-filter', 'CtsCarTestCases', '--include-filter', 'CtsCarrierApiTestCases', '--include-filter', 'CtsColorModeTestCases', '--include-filter', 'CtsCompilationTestCases', '--include-filter', 'CtsContactsProviderWipe', '--include-filter', 'CtsContentTestCases', '--include-filter', 'CtsCppToolsTestCases', '--include-filter', 'CtsCurrentApiSignatureTestCases', '--include-filter', 'CtsDatabaseTestCases', '--include-filter', 'CtsDebugTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases
index 4aed065..524b7cf 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases
@@ -23,8 +23,8 @@
max_retry=15,
tag='9.0_r10.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDeqpTestCases'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDeqpTestCases', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='all.CtsDeqpTestCases_-_CtsDeqpTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases
index 890afe0..b60b1c1 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases
@@ -23,8 +23,8 @@
max_retry=9,
tag='9.0_r10.arm.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeviceIdleHostTestCases', '--include-filter', 'CtsDevicePolicyManagerTestCases', '--include-filter', 'CtsDexMetadataHostTestCases', '--include-filter', 'CtsDisplayTestCases', '--include-filter', 'CtsDpiTestCases', '--include-filter', 'CtsDpiTestCases2', '--include-filter', 'CtsDreamsTestCases', '--include-filter', 'CtsDrmTestCases', '--include-filter', 'CtsDumpsysHostTestCases', '--include-filter', 'CtsDynamicLinkerTestCases', '--include-filter', 'CtsEdiHostTestCases', '--include-filter', 'CtsEffectTestCases', '--include-filter', 'CtsExternalServiceTestCases', '--include-filter', 'CtsExternalSourcesTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeviceIdleHostTestCases', '--include-filter', 'CtsDevicePolicyManagerTestCases', '--include-filter', 'CtsDexMetadataHostTestCases', '--include-filter', 'CtsDisplayTestCases', '--include-filter', 'CtsDpiTestCases', '--include-filter', 'CtsDpiTestCases2', '--include-filter', 'CtsDreamsTestCases', '--include-filter', 'CtsDrmTestCases', '--include-filter', 'CtsDumpsysHostTestCases', '--include-filter', 'CtsDynamicLinkerTestCases', '--include-filter', 'CtsEdiHostTestCases', '--include-filter', 'CtsEffectTestCases', '--include-filter', 'CtsExternalServiceTestCases', '--include-filter', 'CtsExternalSourcesTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
index 4383a2e..0f03907 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
@@ -23,8 +23,8 @@
max_retry=9,
tag='9.0_r10.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsFileSystemTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsFileSystemTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='all.CtsFileSystemTestCases_-_CtsFileSystemTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases
index 6550f22..2af9d66 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases
@@ -23,8 +23,8 @@
max_retry=9,
tag='9.0_r10.arm.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiAttachingHostTestCases', '--include-filter', 'CtsJvmtiAttachingTestCases', '--include-filter', 'CtsJvmtiRedefineClassesHostTestCases', '--include-filter', 'CtsJvmtiRunTest1900HostTestCases', '--include-filter', 'CtsJvmtiRunTest1901HostTestCases', '--include-filter', 'CtsJvmtiRunTest1902HostTestCases', '--include-filter', 'CtsJvmtiRunTest1903HostTestCases', '--include-filter', 'CtsJvmtiRunTest1904HostTestCases', '--include-filter', 'CtsJvmtiRunTest1906HostTestCases', '--include-filter', 'CtsJvmtiRunTest1907HostTestCases', '--include-filter', 'CtsJvmtiRunTest1908HostTestCases', '--include-filter', 'CtsJvmtiRunTest1909HostTestCases', '--include-filter', 'CtsJvmtiRunTest1910HostTestCases', '--include-filter', 'CtsJvmtiRunTest1911HostTestCases', '--include-filter', 'CtsJvmtiRunTest1912HostTestCases', '--include-filter', 'CtsJvmtiRunTest1913HostTestCases', '--include-filter', 'CtsJvmtiRunTest1914HostTestCases', '--include-filter', 'CtsJvmtiRunTest1915HostTestCases', '--include-filter', 'CtsJvmtiRunTest1916HostTestCases', '--include-filter', 'CtsJvmtiRunTest1917HostTestCases', '--include-filter', 'CtsJvmtiRunTest1920HostTestCases', '--include-filter', 'CtsJvmtiRunTest1921HostTestCases', '--include-filter', 'CtsJvmtiRunTest1922HostTestCases', '--include-filter', 'CtsJvmtiRunTest1923HostTestCases', '--include-filter', 'CtsJvmtiRunTest1924HostTestCases', '--include-filter', 'CtsJvmtiRunTest1925HostTestCases', '--include-filter', 'CtsJvmtiRunTest1926HostTestCases', '--include-filter', 'CtsJvmtiRunTest1927HostTestCases', '--include-filter', 'CtsJvmtiRunTest1928HostTestCases', '--include-filter', 'CtsJvmtiRunTest1930HostTestCases', '--include-filter', 'CtsJvmtiRunTest1931HostTestCases', '--include-filter', 'CtsJvmtiRunTest1932HostTestCases', '--include-filter', 'CtsJvmtiRunTest1933HostTestCases', '--include-filter', 'CtsJvmtiRunTest1934HostTestCases', '--include-filter', 'CtsJvmtiRunTest1936HostTestCases', '--include-filter', 'CtsJvmtiRunTest1937HostTestCases', '--include-filter', 'CtsJvmtiRunTest1939HostTestCases', '--include-filter', 'CtsJvmtiRunTest1941HostTestCases', '--include-filter', 'CtsJvmtiRunTest1942HostTestCases', '--include-filter', 'CtsJvmtiRunTest1943HostTestCases', '--include-filter', 'CtsJvmtiRunTest902HostTestCases', '--include-filter', 'CtsJvmtiRunTest903HostTestCases', '--include-filter', 'CtsJvmtiRunTest904HostTestCases', '--include-filter', 'CtsJvmtiRunTest905HostTestCases', '--include-filter', 'CtsJvmtiRunTest906HostTestCases', '--include-filter', 'CtsJvmtiRunTest907HostTestCases', '--include-filter', 'CtsJvmtiRunTest908HostTestCases', '--include-filter', 'CtsJvmtiRunTest910HostTestCases', '--include-filter', 'CtsJvmtiRunTest911HostTestCases', '--include-filter', 'CtsJvmtiRunTest912HostTestCases', '--include-filter', 'CtsJvmtiRunTest913HostTestCases', '--include-filter', 'CtsJvmtiRunTest914HostTestCases', '--include-filter', 'CtsJvmtiRunTest915HostTestCases', '--include-filter', 'CtsJvmtiRunTest917HostTestCases', '--include-filter', 'CtsJvmtiRunTest918HostTestCases', '--include-filter', 'CtsJvmtiRunTest919HostTestCases', '--include-filter', 'CtsJvmtiRunTest920HostTestCases', '--include-filter', 'CtsJvmtiRunTest922HostTestCases', '--include-filter', 'CtsJvmtiRunTest923HostTestCases', '--include-filter', 'CtsJvmtiRunTest924HostTestCases', '--include-filter', 'CtsJvmtiRunTest926HostTestCases', '--include-filter', 'CtsJvmtiRunTest927HostTestCases', '--include-filter', 'CtsJvmtiRunTest928HostTestCases', '--include-filter', 'CtsJvmtiRunTest930HostTestCases', '--include-filter', 'CtsJvmtiRunTest931HostTestCases', '--include-filter', 'CtsJvmtiRunTest932HostTestCases', '--include-filter', 'CtsJvmtiRunTest940HostTestCases', '--include-filter', 'CtsJvmtiRunTest942HostTestCases', '--include-filter', 'CtsJvmtiRunTest944HostTestCases', '--include-filter', 'CtsJvmtiRunTest945HostTestCases', '--include-filter', 'CtsJvmtiRunTest947HostTestCases', '--include-filter', 'CtsJvmtiRunTest951HostTestCases', '--include-filter', 'CtsJvmtiRunTest982HostTestCases', '--include-filter', 'CtsJvmtiRunTest983HostTestCases', '--include-filter', 'CtsJvmtiRunTest984HostTestCases', '--include-filter', 'CtsJvmtiRunTest985HostTestCases', '--include-filter', 'CtsJvmtiRunTest986HostTestCases', '--include-filter', 'CtsJvmtiRunTest988HostTestCases', '--include-filter', 'CtsJvmtiRunTest989HostTestCases', '--include-filter', 'CtsJvmtiRunTest990HostTestCases', '--include-filter', 'CtsJvmtiRunTest991HostTestCases', '--include-filter', 'CtsJvmtiRunTest992HostTestCases', '--include-filter', 'CtsJvmtiRunTest993HostTestCases', '--include-filter', 'CtsJvmtiRunTest994HostTestCases', '--include-filter', 'CtsJvmtiRunTest995HostTestCases', '--include-filter', 'CtsJvmtiRunTest996HostTestCases', '--include-filter', 'CtsJvmtiRunTest997HostTestCases', '--include-filter', 'CtsJvmtiTaggingHostTestCases', '--include-filter', 'CtsJvmtiTrackingHostTestCases', '--include-filter', 'CtsKernelConfigTestCases', '--include-filter', 'CtsKeystoreTestCases', '--include-filter', 'CtsLeanbackJankTestCases', '--include-filter', 'CtsLegacyNotificationTestCases', '--include-filter', 'CtsLibcoreFileIOTestCases', '--include-filter', 'CtsLibcoreJsr166TestCases', '--include-filter', 'CtsLibcoreLegacy22TestCases', '--include-filter', 'CtsLibcoreOjTestCases', '--include-filter', 'CtsLibcoreOkHttpTestCases', '--include-filter', 'CtsLibcoreTestCases', '--include-filter', 'CtsLibcoreWycheproofBCTestCases', '--include-filter', 'CtsLibcoreWycheproofConscryptTestCases', '--include-filter', 'CtsLiblogTestCases', '--include-filter', 'CtsLocation2TestCases', '--include-filter', 'CtsLocationTestCases', '--include-filter', 'CtsLogdTestCases'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiAttachingHostTestCases', '--include-filter', 'CtsJvmtiAttachingTestCases', '--include-filter', 'CtsJvmtiRedefineClassesHostTestCases', '--include-filter', 'CtsJvmtiRunTest1900HostTestCases', '--include-filter', 'CtsJvmtiRunTest1901HostTestCases', '--include-filter', 'CtsJvmtiRunTest1902HostTestCases', '--include-filter', 'CtsJvmtiRunTest1903HostTestCases', '--include-filter', 'CtsJvmtiRunTest1904HostTestCases', '--include-filter', 'CtsJvmtiRunTest1906HostTestCases', '--include-filter', 'CtsJvmtiRunTest1907HostTestCases', '--include-filter', 'CtsJvmtiRunTest1908HostTestCases', '--include-filter', 'CtsJvmtiRunTest1909HostTestCases', '--include-filter', 'CtsJvmtiRunTest1910HostTestCases', '--include-filter', 'CtsJvmtiRunTest1911HostTestCases', '--include-filter', 'CtsJvmtiRunTest1912HostTestCases', '--include-filter', 'CtsJvmtiRunTest1913HostTestCases', '--include-filter', 'CtsJvmtiRunTest1914HostTestCases', '--include-filter', 'CtsJvmtiRunTest1915HostTestCases', '--include-filter', 'CtsJvmtiRunTest1916HostTestCases', '--include-filter', 'CtsJvmtiRunTest1917HostTestCases', '--include-filter', 'CtsJvmtiRunTest1920HostTestCases', '--include-filter', 'CtsJvmtiRunTest1921HostTestCases', '--include-filter', 'CtsJvmtiRunTest1922HostTestCases', '--include-filter', 'CtsJvmtiRunTest1923HostTestCases', '--include-filter', 'CtsJvmtiRunTest1924HostTestCases', '--include-filter', 'CtsJvmtiRunTest1925HostTestCases', '--include-filter', 'CtsJvmtiRunTest1926HostTestCases', '--include-filter', 'CtsJvmtiRunTest1927HostTestCases', '--include-filter', 'CtsJvmtiRunTest1928HostTestCases', '--include-filter', 'CtsJvmtiRunTest1930HostTestCases', '--include-filter', 'CtsJvmtiRunTest1931HostTestCases', '--include-filter', 'CtsJvmtiRunTest1932HostTestCases', '--include-filter', 'CtsJvmtiRunTest1933HostTestCases', '--include-filter', 'CtsJvmtiRunTest1934HostTestCases', '--include-filter', 'CtsJvmtiRunTest1936HostTestCases', '--include-filter', 'CtsJvmtiRunTest1937HostTestCases', '--include-filter', 'CtsJvmtiRunTest1939HostTestCases', '--include-filter', 'CtsJvmtiRunTest1941HostTestCases', '--include-filter', 'CtsJvmtiRunTest1942HostTestCases', '--include-filter', 'CtsJvmtiRunTest1943HostTestCases', '--include-filter', 'CtsJvmtiRunTest902HostTestCases', '--include-filter', 'CtsJvmtiRunTest903HostTestCases', '--include-filter', 'CtsJvmtiRunTest904HostTestCases', '--include-filter', 'CtsJvmtiRunTest905HostTestCases', '--include-filter', 'CtsJvmtiRunTest906HostTestCases', '--include-filter', 'CtsJvmtiRunTest907HostTestCases', '--include-filter', 'CtsJvmtiRunTest908HostTestCases', '--include-filter', 'CtsJvmtiRunTest910HostTestCases', '--include-filter', 'CtsJvmtiRunTest911HostTestCases', '--include-filter', 'CtsJvmtiRunTest912HostTestCases', '--include-filter', 'CtsJvmtiRunTest913HostTestCases', '--include-filter', 'CtsJvmtiRunTest914HostTestCases', '--include-filter', 'CtsJvmtiRunTest915HostTestCases', '--include-filter', 'CtsJvmtiRunTest917HostTestCases', '--include-filter', 'CtsJvmtiRunTest918HostTestCases', '--include-filter', 'CtsJvmtiRunTest919HostTestCases', '--include-filter', 'CtsJvmtiRunTest920HostTestCases', '--include-filter', 'CtsJvmtiRunTest922HostTestCases', '--include-filter', 'CtsJvmtiRunTest923HostTestCases', '--include-filter', 'CtsJvmtiRunTest924HostTestCases', '--include-filter', 'CtsJvmtiRunTest926HostTestCases', '--include-filter', 'CtsJvmtiRunTest927HostTestCases', '--include-filter', 'CtsJvmtiRunTest928HostTestCases', '--include-filter', 'CtsJvmtiRunTest930HostTestCases', '--include-filter', 'CtsJvmtiRunTest931HostTestCases', '--include-filter', 'CtsJvmtiRunTest932HostTestCases', '--include-filter', 'CtsJvmtiRunTest940HostTestCases', '--include-filter', 'CtsJvmtiRunTest942HostTestCases', '--include-filter', 'CtsJvmtiRunTest944HostTestCases', '--include-filter', 'CtsJvmtiRunTest945HostTestCases', '--include-filter', 'CtsJvmtiRunTest947HostTestCases', '--include-filter', 'CtsJvmtiRunTest951HostTestCases', '--include-filter', 'CtsJvmtiRunTest982HostTestCases', '--include-filter', 'CtsJvmtiRunTest983HostTestCases', '--include-filter', 'CtsJvmtiRunTest984HostTestCases', '--include-filter', 'CtsJvmtiRunTest985HostTestCases', '--include-filter', 'CtsJvmtiRunTest986HostTestCases', '--include-filter', 'CtsJvmtiRunTest988HostTestCases', '--include-filter', 'CtsJvmtiRunTest989HostTestCases', '--include-filter', 'CtsJvmtiRunTest990HostTestCases', '--include-filter', 'CtsJvmtiRunTest991HostTestCases', '--include-filter', 'CtsJvmtiRunTest992HostTestCases', '--include-filter', 'CtsJvmtiRunTest993HostTestCases', '--include-filter', 'CtsJvmtiRunTest994HostTestCases', '--include-filter', 'CtsJvmtiRunTest995HostTestCases', '--include-filter', 'CtsJvmtiRunTest996HostTestCases', '--include-filter', 'CtsJvmtiRunTest997HostTestCases', '--include-filter', 'CtsJvmtiTaggingHostTestCases', '--include-filter', 'CtsJvmtiTrackingHostTestCases', '--include-filter', 'CtsKernelConfigTestCases', '--include-filter', 'CtsKeystoreTestCases', '--include-filter', 'CtsLeanbackJankTestCases', '--include-filter', 'CtsLegacyNotificationTestCases', '--include-filter', 'CtsLibcoreFileIOTestCases', '--include-filter', 'CtsLibcoreJsr166TestCases', '--include-filter', 'CtsLibcoreLegacy22TestCases', '--include-filter', 'CtsLibcoreOjTestCases', '--include-filter', 'CtsLibcoreOkHttpTestCases', '--include-filter', 'CtsLibcoreTestCases', '--include-filter', 'CtsLibcoreWycheproofBCTestCases', '--include-filter', 'CtsLibcoreWycheproofConscryptTestCases', '--include-filter', 'CtsLiblogTestCases', '--include-filter', 'CtsLocation2TestCases', '--include-filter', 'CtsLocationTestCases', '--include-filter', 'CtsLogdTestCases', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases
index 5b7c73b..75514b2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases
@@ -23,8 +23,8 @@
max_retry=9,
tag='9.0_r10.arm.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaHostTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='all.CtsMediaHostTestCases_-_CtsMediaHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases
index 1ceccd8..b238c44 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases
@@ -23,8 +23,8 @@
max_retry=9,
tag='9.0_r10.arm.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMidiTestCases', '--include-filter', 'CtsMockingDebuggableTestCases', '--include-filter', 'CtsMockingTestCases', '--include-filter', 'CtsMonkeyTestCases', '--include-filter', 'CtsMultiUserHostTestCases', '--include-filter', 'CtsMultiUserTestCases', '--include-filter', 'CtsNNAPITestCases', '--include-filter', 'CtsNativeHardwareTestCases', '--include-filter', 'CtsNativeMediaAAudioTestCases', '--include-filter', 'CtsNativeMediaSlTestCases', '--include-filter', 'CtsNativeMediaXaTestCases', '--include-filter', 'CtsNativeNetTestCases', '--include-filter', 'CtsNdefTestCases', '--include-filter', 'CtsNetSecConfigAttributeTestCases', '--include-filter', 'CtsNetSecConfigBasicDebugDisabledTestCases', '--include-filter', 'CtsNetSecConfigBasicDebugEnabledTestCases', '--include-filter', 'CtsNetSecConfigBasicDomainConfigTestCases', '--include-filter', 'CtsNetSecConfigCleartextTrafficTestCases', '--include-filter', 'CtsNetSecConfigDownloadManagerTestCases', '--include-filter', 'CtsNetSecConfigInvalidPinTestCases', '--include-filter', 'CtsNetSecConfigNestedDomainConfigTestCases', '--include-filter', 'CtsNetSecConfigPrePCleartextTrafficTestCases', '--include-filter', 'CtsNetSecConfigResourcesSrcTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficFalseTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficTrueTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases', '--include-filter', 'CtsNetTestCases', '--include-filter', 'CtsNetTestCasesLegacyApi22', '--include-filter', 'CtsNetTestCasesLegacyPermission22', '--include-filter', 'CtsOmapiTestCases', '--include-filter', 'CtsOpenGLTestCases', '--include-filter', 'CtsOpenGlPerf2TestCases', '--include-filter', 'CtsOpenGlPerfTestCases', '--include-filter', 'CtsOsHostTestCases', '--include-filter', 'CtsOsTestCases', '--include-filter', 'CtsPdfTestCases', '--include-filter', 'CtsPerfettoTestCases', '--include-filter', 'CtsPermission2TestCases', '--include-filter', 'CtsPermissionTestCases', '--include-filter', 'CtsPreference2TestCases', '--include-filter', 'CtsPreferenceTestCases', '--include-filter', 'CtsPrintTestCases', '--include-filter', 'CtsProtoTestCases', '--include-filter', 'CtsProviderTestCases', '--include-filter', 'CtsRenderscriptLegacyTestCases', '--include-filter', 'CtsRenderscriptTestCases', '--include-filter', 'CtsRsBlasTestCases', '--include-filter', 'CtsRsCppTestCases', '--include-filter', 'CtsSampleDeviceTestCases', '--include-filter', 'CtsSampleHostTestCases', '--include-filter', 'CtsSaxTestCases', '--include-filter', 'CtsSeccompHostTestCases', '--include-filter', 'CtsSecureElementAccessControlTestCases1', '--include-filter', 'CtsSecureElementAccessControlTestCases2', '--include-filter', 'CtsSecureElementAccessControlTestCases3', '--include-filter', 'CtsSecurityBulletinHostTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMidiTestCases', '--include-filter', 'CtsMockingDebuggableTestCases', '--include-filter', 'CtsMockingTestCases', '--include-filter', 'CtsMonkeyTestCases', '--include-filter', 'CtsMultiUserHostTestCases', '--include-filter', 'CtsMultiUserTestCases', '--include-filter', 'CtsNNAPITestCases', '--include-filter', 'CtsNativeHardwareTestCases', '--include-filter', 'CtsNativeMediaAAudioTestCases', '--include-filter', 'CtsNativeMediaSlTestCases', '--include-filter', 'CtsNativeMediaXaTestCases', '--include-filter', 'CtsNativeNetTestCases', '--include-filter', 'CtsNdefTestCases', '--include-filter', 'CtsNetSecConfigAttributeTestCases', '--include-filter', 'CtsNetSecConfigBasicDebugDisabledTestCases', '--include-filter', 'CtsNetSecConfigBasicDebugEnabledTestCases', '--include-filter', 'CtsNetSecConfigBasicDomainConfigTestCases', '--include-filter', 'CtsNetSecConfigCleartextTrafficTestCases', '--include-filter', 'CtsNetSecConfigDownloadManagerTestCases', '--include-filter', 'CtsNetSecConfigInvalidPinTestCases', '--include-filter', 'CtsNetSecConfigNestedDomainConfigTestCases', '--include-filter', 'CtsNetSecConfigPrePCleartextTrafficTestCases', '--include-filter', 'CtsNetSecConfigResourcesSrcTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficFalseTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficTrueTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases', '--include-filter', 'CtsNetTestCases', '--include-filter', 'CtsNetTestCasesLegacyApi22', '--include-filter', 'CtsNetTestCasesLegacyPermission22', '--include-filter', 'CtsOmapiTestCases', '--include-filter', 'CtsOpenGLTestCases', '--include-filter', 'CtsOpenGlPerf2TestCases', '--include-filter', 'CtsOpenGlPerfTestCases', '--include-filter', 'CtsOsHostTestCases', '--include-filter', 'CtsOsTestCases', '--include-filter', 'CtsPdfTestCases', '--include-filter', 'CtsPerfettoTestCases', '--include-filter', 'CtsPermission2TestCases', '--include-filter', 'CtsPermissionTestCases', '--include-filter', 'CtsPreference2TestCases', '--include-filter', 'CtsPreferenceTestCases', '--include-filter', 'CtsPrintTestCases', '--include-filter', 'CtsProtoTestCases', '--include-filter', 'CtsProviderTestCases', '--include-filter', 'CtsRenderscriptLegacyTestCases', '--include-filter', 'CtsRenderscriptTestCases', '--include-filter', 'CtsRsBlasTestCases', '--include-filter', 'CtsRsCppTestCases', '--include-filter', 'CtsSampleDeviceTestCases', '--include-filter', 'CtsSampleHostTestCases', '--include-filter', 'CtsSaxTestCases', '--include-filter', 'CtsSeccompHostTestCases', '--include-filter', 'CtsSecureElementAccessControlTestCases1', '--include-filter', 'CtsSecureElementAccessControlTestCases2', '--include-filter', 'CtsSecureElementAccessControlTestCases3', '--include-filter', 'CtsSecurityBulletinHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases
index 5f5fbe9..583f7b6 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases
@@ -23,8 +23,8 @@
max_retry=9,
tag='9.0_r10.arm.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSecurityHostTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSecurityHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases
index ada7b18..c3bf130 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases
@@ -23,8 +23,8 @@
max_retry=9,
tag='9.0_r10.arm.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecurityTestCases', '--include-filter', 'CtsSelinuxTargetSdk25TestCases', '--include-filter', 'CtsSelinuxTargetSdk27TestCases', '--include-filter', 'CtsSelinuxTargetSdkCurrentTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecurityTestCases', '--include-filter', 'CtsSelinuxTargetSdk25TestCases', '--include-filter', 'CtsSelinuxTargetSdk27TestCases', '--include-filter', 'CtsSelinuxTargetSdkCurrentTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsSensorTestCases_-_CtsSensorTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsSensorTestCases_-_CtsSensorTestCases
index 6240ebf..b28c6ba 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsSensorTestCases_-_CtsSensorTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsSensorTestCases_-_CtsSensorTestCases
@@ -23,8 +23,8 @@
max_retry=30,
tag='9.0_r10.arm.all.CtsSensorTestCases_-_CtsSensorTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.all.CtsSensorTestCases_-_CtsSensorTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSensorTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSensorTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='all.CtsSensorTestCases_-_CtsSensorTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsShortcutHostTestCases_-_CtsVideoTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsShortcutHostTestCases_-_CtsVideoTestCases
index 5e0740e..d102200 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsShortcutHostTestCases_-_CtsVideoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsShortcutHostTestCases_-_CtsVideoTestCases
@@ -23,8 +23,8 @@
max_retry=9,
tag='9.0_r10.arm.all.CtsShortcutHostTestCases_-_CtsVideoTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.all.CtsShortcutHostTestCases_-_CtsVideoTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsShortcutHostTestCases', '--include-filter', 'CtsShortcutManagerTestCases', '--include-filter', 'CtsSimRestrictedApisTestCases', '--include-filter', 'CtsSimpleCpuTestCases', '--include-filter', 'CtsSimpleperfTestCases', '--include-filter', 'CtsSkQPTestCases', '--include-filter', 'CtsSliceTestCases', '--include-filter', 'CtsSpeechTestCases', '--include-filter', 'CtsStatsdHostTestCases', '--include-filter', 'CtsSustainedPerformanceHostTestCases', '--include-filter', 'CtsSyncAccountAccessOtherCertTestCases', '--include-filter', 'CtsSyncContentHostTestCases', '--include-filter', 'CtsSyncManagerTestsCases', '--include-filter', 'CtsSystemApiAnnotationTestCases', '--include-filter', 'CtsSystemApiSignatureTestCases', '--include-filter', 'CtsSystemIntentTestCases', '--include-filter', 'CtsSystemUiHostTestCases', '--include-filter', 'CtsSystemUiTestCases', '--include-filter', 'CtsTelecomTestCases', '--include-filter', 'CtsTelecomTestCases2', '--include-filter', 'CtsTelecomTestCases3', '--include-filter', 'CtsTelephony2TestCases', '--include-filter', 'CtsTelephonyTestCases', '--include-filter', 'CtsTextTestCases', '--include-filter', 'CtsThemeDeviceTestCases', '--include-filter', 'CtsThemeHostTestCases', '--include-filter', 'CtsToastLegacyTestCases', '--include-filter', 'CtsToastTestCases', '--include-filter', 'CtsTransitionTestCases', '--include-filter', 'CtsTrustedVoiceHostTestCases', '--include-filter', 'CtsTvProviderTestCases', '--include-filter', 'CtsTvTestCases', '--include-filter', 'CtsUiAutomationTestCases', '--include-filter', 'CtsUiDeviceTestCases', '--include-filter', 'CtsUiRenderingTestCases', '--include-filter', 'CtsUidIsolationTestCases', '--include-filter', 'CtsUsageStatsTestCases', '--include-filter', 'CtsUsbTests', '--include-filter', 'CtsUtilTestCases', '--include-filter', 'CtsVideoTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsShortcutHostTestCases', '--include-filter', 'CtsShortcutManagerTestCases', '--include-filter', 'CtsSimRestrictedApisTestCases', '--include-filter', 'CtsSimpleCpuTestCases', '--include-filter', 'CtsSimpleperfTestCases', '--include-filter', 'CtsSkQPTestCases', '--include-filter', 'CtsSliceTestCases', '--include-filter', 'CtsSpeechTestCases', '--include-filter', 'CtsStatsdHostTestCases', '--include-filter', 'CtsSustainedPerformanceHostTestCases', '--include-filter', 'CtsSyncAccountAccessOtherCertTestCases', '--include-filter', 'CtsSyncContentHostTestCases', '--include-filter', 'CtsSyncManagerTestsCases', '--include-filter', 'CtsSystemApiAnnotationTestCases', '--include-filter', 'CtsSystemApiSignatureTestCases', '--include-filter', 'CtsSystemIntentTestCases', '--include-filter', 'CtsSystemUiHostTestCases', '--include-filter', 'CtsSystemUiTestCases', '--include-filter', 'CtsTelecomTestCases', '--include-filter', 'CtsTelecomTestCases2', '--include-filter', 'CtsTelecomTestCases3', '--include-filter', 'CtsTelephony2TestCases', '--include-filter', 'CtsTelephonyTestCases', '--include-filter', 'CtsTextTestCases', '--include-filter', 'CtsThemeDeviceTestCases', '--include-filter', 'CtsThemeHostTestCases', '--include-filter', 'CtsToastLegacyTestCases', '--include-filter', 'CtsToastTestCases', '--include-filter', 'CtsTransitionTestCases', '--include-filter', 'CtsTrustedVoiceHostTestCases', '--include-filter', 'CtsTvProviderTestCases', '--include-filter', 'CtsTvTestCases', '--include-filter', 'CtsUiAutomationTestCases', '--include-filter', 'CtsUiDeviceTestCases', '--include-filter', 'CtsUiRenderingTestCases', '--include-filter', 'CtsUidIsolationTestCases', '--include-filter', 'CtsUsageStatsTestCases', '--include-filter', 'CtsUsbTests', '--include-filter', 'CtsUtilTestCases', '--include-filter', 'CtsVideoTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='all.CtsShortcutHostTestCases_-_CtsVideoTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsViewTestCases_-_CtsViewTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsViewTestCases_-_CtsViewTestCases
index 4b82da5..684a493 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsViewTestCases_-_CtsViewTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsViewTestCases_-_CtsViewTestCases
@@ -23,8 +23,8 @@
max_retry=9,
tag='9.0_r10.arm.all.CtsViewTestCases_-_CtsViewTestCases',
test_name='cheets_CTS_P.9.0_r10.arm.all.CtsViewTestCases_-_CtsViewTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsViewTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsViewTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='all.CtsViewTestCases_-_CtsViewTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsVmTestCases_-_vm-tests-tf b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsVmTestCases_-_vm-tests-tf
index 38392f1..4c557cc 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsVmTestCases_-_vm-tests-tf
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.all.CtsVmTestCases_-_vm-tests-tf
@@ -23,8 +23,8 @@
max_retry=9,
tag='9.0_r10.arm.all.CtsVmTestCases_-_vm-tests-tf',
test_name='cheets_CTS_P.9.0_r10.arm.all.CtsVmTestCases_-_vm-tests-tf',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsVmTestCases', '--include-filter', 'CtsVoiceInteractionTestCases', '--include-filter', 'CtsVoiceSettingsTestCases', '--include-filter', 'CtsVrTestCases', '--include-filter', 'CtsWebkitTestCases', '--include-filter', 'CtsWidgetTestCases', '--include-filter', 'CtsWindowManagerDeviceTestCases', '--include-filter', 'CtsWrapNoWrapTestCases', '--include-filter', 'CtsWrapWrapDebugMallocDebugTestCases', '--include-filter', 'CtsWrapWrapDebugTestCases', '--include-filter', 'CtsWrapWrapNoDebugTestCases', '--include-filter', 'cts-system-all.api', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases1', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases2', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases3', '--include-filter', 'vm-tests-tf', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsVmTestCases', '--include-filter', 'CtsVoiceInteractionTestCases', '--include-filter', 'CtsVoiceSettingsTestCases', '--include-filter', 'CtsVrTestCases', '--include-filter', 'CtsWebkitTestCases', '--include-filter', 'CtsWidgetTestCases', '--include-filter', 'CtsWindowManagerDeviceTestCases', '--include-filter', 'CtsWrapNoWrapTestCases', '--include-filter', 'CtsWrapWrapDebugMallocDebugTestCases', '--include-filter', 'CtsWrapWrapDebugTestCases', '--include-filter', 'CtsWrapWrapNoDebugTestCases', '--include-filter', 'cts-system-all.api', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases1', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases2', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases3', '--include-filter', 'vm-tests-tf', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='all.CtsVmTestCases_-_vm-tests-tf',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.cts-system-all.api b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.cts-system-all.api
index aff4d77..e9ce910 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.cts-system-all.api
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.cts-system-all.api
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.cts-system-all.api',
test_name='cheets_CTS_P.9.0_r10.arm.cts-system-all.api',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'cts-system-all.api', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'cts-system-all.api', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='cts-system-all.api',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.signed-CtsSecureElementAccessControl b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.signed-CtsSecureElementAccessControl
index f156f07..3ec6f23 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.signed-CtsSecureElementAccessControl
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.signed-CtsSecureElementAccessControl
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.signed-CtsSecureElementAccessControl',
test_name='cheets_CTS_P.9.0_r10.arm.signed-CtsSecureElementAccessControl',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases1', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases2', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases3', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases1', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases2', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases3', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='signed-CtsSecureElementAccessControl',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.tradefed-run-collect-tests-only-internal b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.tradefed-run-collect-tests-only-internal
index a789fa5..cd74bec 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.tradefed-run-collect-tests-only-internal
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.tradefed-run-collect-tests-only-internal
@@ -23,7 +23,7 @@
max_retry=0,
tag='9.0_r10.arm.tradefed-run-collect-tests-only-internal',
test_name='cheets_CTS_P.9.0_r10.arm.tradefed-run-collect-tests-only-internal',
- run_template=['run', 'commandAndExit', 'collect-tests-only', '--disable-reboot', '--module-arg', 'CtsMediaTestCases:skip-media-download:true', '--module-arg', 'CtsMediaStressTestCases:skip-media-download:true', '--module-arg', 'CtsMediaBitstreamsTestCases:skip-media-download:true'],
+ run_template=['run', 'commandAndExit', 'collect-tests-only', '--disable-reboot', '--module-arg', 'CtsMediaTestCases:skip-media-download:true', '--module-arg', 'CtsMediaStressTestCases:skip-media-download:true', '--module-arg', 'CtsMediaBitstreamsTestCases:skip-media-download:true', '--dynamic-config-url='],
retry_template=None,
target_module=None,
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.vm-tests-tf b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.vm-tests-tf
index ba50529..f9a71ca 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.vm-tests-tf
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.vm-tests-tf
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.vm-tests-tf',
test_name='cheets_CTS_P.9.0_r10.arm.vm-tests-tf',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'vm-tests-tf', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'vm-tests-tf', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='vm-tests-tf',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.wm-presubmit b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.wm-presubmit
index 4c66296..508f22a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.wm-presubmit
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.wm-presubmit
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.arm.wm-presubmit',
test_name='cheets_CTS_P.9.0_r10.arm.wm-presubmit',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsActivityManagerDeviceSdk25TestCases', '--include-filter', 'CtsActivityManagerDeviceTestCases', '--include-filter', 'CtsAppTestCases android.app.cts.TaskDescriptionTest', '--include-filter', 'CtsWindowManagerDeviceTestCases', '--test-arg', 'com.android.compatibility.common.tradefed.testtype.JarHostTest:include-annotation:android.platform.test.annotations.Presubmit', '--test-arg', 'com.android.tradefed.testtype.AndroidJUnitTest:include-annotation:android.platform.test.annotations.Presubmit', '--test-arg', 'com.android.tradefed.testtype.HostTest:include-annotation:android.platform.test.annotations.Presubmit', '--test-arg', 'com.android.tradefed.testtype.AndroidJUnitTest:exclude-annotation:androidx.test.filters.FlakyTest', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsActivityManagerDeviceSdk25TestCases', '--include-filter', 'CtsActivityManagerDeviceTestCases', '--include-filter', 'CtsAppTestCases android.app.cts.TaskDescriptionTest', '--include-filter', 'CtsWindowManagerDeviceTestCases', '--test-arg', 'com.android.compatibility.common.tradefed.testtype.JarHostTest:include-annotation:android.platform.test.annotations.Presubmit', '--test-arg', 'com.android.tradefed.testtype.AndroidJUnitTest:include-annotation:android.platform.test.annotations.Presubmit', '--test-arg', 'com.android.tradefed.testtype.HostTest:include-annotation:android.platform.test.annotations.Presubmit', '--test-arg', 'com.android.tradefed.testtype.AndroidJUnitTest:exclude-annotation:androidx.test.filters.FlakyTest', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='wm-presubmit',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAbiOverrideHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAbiOverrideHostTestCases
index 8b2894c..b650494 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAbiOverrideHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAbiOverrideHostTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsAbiOverrideHostTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsAbiOverrideHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAbiOverrideHostTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAbiOverrideHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsAbiOverrideHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAccelerationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAccelerationTestCases
index f7dffba..a9abec8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAccelerationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAccelerationTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsAccelerationTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsAccelerationTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAccelerationTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAccelerationTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsAccelerationTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAccessibility b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAccessibility
index a905336..d1e970a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAccessibility
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAccessibility
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsAccessibility',
test_name='cheets_CTS_P.9.0_r10.x86.CtsAccessibility',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAccessibilityServiceTestCases', '--include-filter', 'CtsAccessibilityTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAccessibilityServiceTestCases', '--include-filter', 'CtsAccessibilityTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsAccessibility',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAccountManagerTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAccountManagerTestCases
index db9097d..45bdf22 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAccountManagerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAccountManagerTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsAccountManagerTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsAccountManagerTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAccountManagerTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAccountManagerTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsAccountManagerTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsActivityManagerDevice b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsActivityManagerDevice
index f4b702b..b69fd1f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsActivityManagerDevice
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsActivityManagerDevice
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsActivityManagerDevice',
test_name='cheets_CTS_P.9.0_r10.x86.CtsActivityManagerDevice',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsActivityManagerDeviceSdk25TestCases', '--include-filter', 'CtsActivityManagerDeviceTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsActivityManagerDeviceSdk25TestCases', '--include-filter', 'CtsActivityManagerDeviceTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsActivityManagerDevice',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAdmin b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAdmin
index 775de78..cd63c1a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAdmin
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAdmin
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsAdmin',
test_name='cheets_CTS_P.9.0_r10.x86.CtsAdmin',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAdminPackageInstallerTestCases', '--include-filter', 'CtsAdminTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAdminPackageInstallerTestCases', '--include-filter', 'CtsAdminTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsAdmin',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAlarm b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAlarm
index 7825673..8d9ab9d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAlarm
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAlarm
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsAlarm',
test_name='cheets_CTS_P.9.0_r10.x86.CtsAlarm',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAlarmClockTestCases', '--include-filter', 'CtsAlarmManagerTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAlarmClockTestCases', '--include-filter', 'CtsAlarmManagerTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsAlarm',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAndroid b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAndroid
index 2f67da3..772e383 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAndroid
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAndroid
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsAndroid',
test_name='cheets_CTS_P.9.0_r10.x86.CtsAndroid',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAndroidAppTestCases', '--include-filter', 'CtsAndroidTestBase27ApiSignatureTestCases', '--include-filter', 'CtsAndroidTestMockCurrentApiSignatureTestCases', '--include-filter', 'CtsAndroidTestRunnerCurrentApiSignatureTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAndroidAppTestCases', '--include-filter', 'CtsAndroidTestBase27ApiSignatureTestCases', '--include-filter', 'CtsAndroidTestMockCurrentApiSignatureTestCases', '--include-filter', 'CtsAndroidTestRunnerCurrentApiSignatureTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsAndroid',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAnimationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAnimationTestCases
index 16ebdc2..d7e4ed6 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAnimationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAnimationTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsAnimationTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsAnimationTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAnimationTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAnimationTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsAnimationTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsApacheHttpLegacy b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsApacheHttpLegacy
index 5f91c9f..04042b9 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsApacheHttpLegacy
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsApacheHttpLegacy
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsApacheHttpLegacy',
test_name='cheets_CTS_P.9.0_r10.x86.CtsApacheHttpLegacy',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsApacheHttpLegacy27ApiSignatureTestCases', '--include-filter', 'CtsApacheHttpLegacyCurrentApiSignatureTestCases', '--include-filter', 'CtsApacheHttpLegacyUsesLibraryApiSignatureTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsApacheHttpLegacy27ApiSignatureTestCases', '--include-filter', 'CtsApacheHttpLegacyCurrentApiSignatureTestCases', '--include-filter', 'CtsApacheHttpLegacyUsesLibraryApiSignatureTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsApacheHttpLegacy',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsApp b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsApp
index 61063a7..e73daae 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsApp
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsApp
@@ -23,8 +23,8 @@
enable_default_apps=True,
tag='9.0_r10.x86.CtsApp',
test_name='cheets_CTS_P.9.0_r10.x86.CtsApp',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAppComponentFactoryTestCases', '--include-filter', 'CtsAppSecurityHostTestCases', '--include-filter', 'CtsAppTestCases', '--include-filter', 'CtsAppUsageHostTestCases', '--include-filter', 'CtsAppWidgetTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAppComponentFactoryTestCases', '--include-filter', 'CtsAppSecurityHostTestCases', '--include-filter', 'CtsAppTestCases', '--include-filter', 'CtsAppUsageHostTestCases', '--include-filter', 'CtsAppWidgetTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsApp',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAslrMallocTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAslrMallocTestCases
index 6ec63ac..fbc954f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAslrMallocTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAslrMallocTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsAslrMallocTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsAslrMallocTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAslrMallocTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAslrMallocTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsAslrMallocTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAssistTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAssistTestCases
index 15f74a3..2580c0a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAssistTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAssistTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsAssistTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsAssistTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAssistTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAssistTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsAssistTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAtraceHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAtraceHostTestCases
index 595bb89..5f3dc69 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAtraceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAtraceHostTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsAtraceHostTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsAtraceHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAtraceHostTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAtraceHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsAtraceHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAutoFillServiceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAutoFillServiceTestCases
index f93cb68..dbee2fe 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAutoFillServiceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsAutoFillServiceTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsAutoFillServiceTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsAutoFillServiceTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAutoFillServiceTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAutoFillServiceTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsAutoFillServiceTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsBackgroundRestrictionsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsBackgroundRestrictionsTestCases
index eb9f62b..221c3ff 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsBackgroundRestrictionsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsBackgroundRestrictionsTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsBackgroundRestrictionsTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsBackgroundRestrictionsTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsBackgroundRestrictionsTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsBackgroundRestrictionsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsBackgroundRestrictionsTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsBackup b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsBackup
index 7477aa5..ecbb36b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsBackup
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsBackup
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsBackup',
test_name='cheets_CTS_P.9.0_r10.x86.CtsBackup',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsBackupHostTestCases', '--include-filter', 'CtsBackupTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsBackupHostTestCases', '--include-filter', 'CtsBackupTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsBackup',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsBatterySavingTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsBatterySavingTestCases
index 409c23a..8232756 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsBatterySavingTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsBatterySavingTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsBatterySavingTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsBatterySavingTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsBatterySavingTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsBatterySavingTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsBatterySavingTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsBionicTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsBionicTestCases
index a72d23c..820cba0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsBionicTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsBionicTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsBionicTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsBionicTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsBionicTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsBionicTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsBionicTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsBluetoothTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsBluetoothTestCases
index 840f861..29c0bd7 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsBluetoothTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsBluetoothTestCases
@@ -35,8 +35,8 @@
iterations=1,
tag='9.0_r10.x86.CtsBluetoothTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsBluetoothTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsBluetoothTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsBluetoothTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsBluetoothTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsBootStatsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsBootStatsTestCases
index 177f3d7..2d7919d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsBootStatsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsBootStatsTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsBootStatsTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsBootStatsTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsBootStatsTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsBootStatsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsBootStatsTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCalendarcommon2TestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCalendarcommon2TestCases
index d6218b0..bdcb6d5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCalendarcommon2TestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCalendarcommon2TestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsCalendarcommon2TestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsCalendarcommon2TestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCalendarcommon2TestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCalendarcommon2TestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsCalendarcommon2TestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCamera b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCamera
index 8b72f07..05897dc 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCamera
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCamera
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsCamera',
test_name='cheets_CTS_P.9.0_r10.x86.CtsCamera',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraApi25TestCases', '--include-filter', 'CtsCameraTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraApi25TestCases', '--include-filter', 'CtsCameraTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsCamera',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCameraTestCases.camerabox.back b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCameraTestCases.camerabox.back
index 6627c4b..00fc269 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCameraTestCases.camerabox.back
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCameraTestCases.camerabox.back
@@ -24,8 +24,8 @@
iterations=1,
tag='9.0_r10.x86.CtsCameraTestCases.camerabox.back',
test_name='cheets_CTS_P.9.0_r10.x86.CtsCameraTestCases.camerabox.back',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCameraTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCameraTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsCameraTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCameraTestCases.camerabox.front b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCameraTestCases.camerabox.front
index 604147a..c1a36af 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCameraTestCases.camerabox.front
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCameraTestCases.camerabox.front
@@ -24,8 +24,8 @@
iterations=1,
tag='9.0_r10.x86.CtsCameraTestCases.camerabox.front',
test_name='cheets_CTS_P.9.0_r10.x86.CtsCameraTestCases.camerabox.front',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCameraTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCameraTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsCameraTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCarTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCarTestCases
index 89c048f..1e9356f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCarTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCarTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsCarTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsCarTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCarTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCarTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsCarTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCarrierApiTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCarrierApiTestCases
index cb38c87..3fd6c92 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCarrierApiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCarrierApiTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsCarrierApiTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsCarrierApiTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCarrierApiTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCarrierApiTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsCarrierApiTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsColorModeTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsColorModeTestCases
index 7fd151b..9e925a3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsColorModeTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsColorModeTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsColorModeTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsColorModeTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsColorModeTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsColorModeTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsColorModeTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCompilationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCompilationTestCases
index 0828dfe..6b1bf81 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCompilationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCompilationTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsCompilationTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsCompilationTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCompilationTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCompilationTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsCompilationTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsContactsProviderWipe b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsContactsProviderWipe
index 2281649..3ff6528 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsContactsProviderWipe
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsContactsProviderWipe
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsContactsProviderWipe',
test_name='cheets_CTS_P.9.0_r10.x86.CtsContactsProviderWipe',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsContactsProviderWipe', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsContactsProviderWipe', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsContactsProviderWipe',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsContentTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsContentTestCases
index cb188c3..34e6d4c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsContentTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsContentTestCases
@@ -23,8 +23,8 @@
enable_default_apps=True,
tag='9.0_r10.x86.CtsContentTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsContentTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsContentTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsContentTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsContentTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCppToolsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCppToolsTestCases
index 7cf2d7f..6b9bcca 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCppToolsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCppToolsTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsCppToolsTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsCppToolsTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCppToolsTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCppToolsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsCppToolsTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCurrentApiSignatureTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCurrentApiSignatureTestCases
index 559ec71..c6ecd05 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCurrentApiSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCurrentApiSignatureTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsCurrentApiSignatureTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsCurrentApiSignatureTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCurrentApiSignatureTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCurrentApiSignatureTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsCurrentApiSignatureTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDatabaseTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDatabaseTestCases
index 592e026..0b8a235 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDatabaseTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDatabaseTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsDatabaseTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsDatabaseTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDatabaseTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDatabaseTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsDatabaseTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDebugTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDebugTestCases
index 7c3b001..c8f4a51 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDebugTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDebugTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsDebugTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsDebugTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDebugTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDebugTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsDebugTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDeqpTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDeqpTestCases
index dace0d3..ed30276 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDeqpTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDeqpTestCases
@@ -23,8 +23,8 @@
max_retry=15,
tag='9.0_r10.x86.CtsDeqpTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsDeqpTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDeqpTestCases'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDeqpTestCases', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsDeqpTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDeqpTestCases.dEQP-EGL b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDeqpTestCases.dEQP-EGL
index ed166d0..f253afd 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDeqpTestCases.dEQP-EGL
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDeqpTestCases.dEQP-EGL
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsDeqpTestCases.dEQP-EGL',
test_name='cheets_CTS_P.9.0_r10.x86.CtsDeqpTestCases.dEQP-EGL',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-EGL.*'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-EGL.*', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsDeqpTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDeqpTestCases.dEQP-GLES2 b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDeqpTestCases.dEQP-GLES2
index 9f37816..c628a88 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDeqpTestCases.dEQP-GLES2
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDeqpTestCases.dEQP-GLES2
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsDeqpTestCases.dEQP-GLES2',
test_name='cheets_CTS_P.9.0_r10.x86.CtsDeqpTestCases.dEQP-GLES2',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES2.*'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES2.*', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsDeqpTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDeqpTestCases.dEQP-GLES3 b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDeqpTestCases.dEQP-GLES3
index e1c2106..cb618d5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDeqpTestCases.dEQP-GLES3
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDeqpTestCases.dEQP-GLES3
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsDeqpTestCases.dEQP-GLES3',
test_name='cheets_CTS_P.9.0_r10.x86.CtsDeqpTestCases.dEQP-GLES3',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES3.*'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES3.*', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsDeqpTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDeqpTestCases.dEQP-GLES31 b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDeqpTestCases.dEQP-GLES31
index aac0f4f..7f2b8dd 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDeqpTestCases.dEQP-GLES31
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDeqpTestCases.dEQP-GLES31
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsDeqpTestCases.dEQP-GLES31',
test_name='cheets_CTS_P.9.0_r10.x86.CtsDeqpTestCases.dEQP-GLES31',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES31.*'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES31.*', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsDeqpTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDeqpTestCases.dEQP-VK b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDeqpTestCases.dEQP-VK
index dd73796..3655501 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDeqpTestCases.dEQP-VK
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDeqpTestCases.dEQP-VK
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsDeqpTestCases.dEQP-VK',
test_name='cheets_CTS_P.9.0_r10.x86.CtsDeqpTestCases.dEQP-VK',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-VK.*'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-VK.*', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsDeqpTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDevice b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDevice
index b86ff2c..472093d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDevice
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDevice
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsDevice',
test_name='cheets_CTS_P.9.0_r10.x86.CtsDevice',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeviceIdleHostTestCases', '--include-filter', 'CtsDevicePolicyManagerTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeviceIdleHostTestCases', '--include-filter', 'CtsDevicePolicyManagerTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsDevice',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDexMetadataHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDexMetadataHostTestCases
index 297c109..305e577 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDexMetadataHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDexMetadataHostTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsDexMetadataHostTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsDexMetadataHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDexMetadataHostTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDexMetadataHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsDexMetadataHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDisplayTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDisplayTestCases
index b7798d4..817ff85 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDisplayTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDisplayTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsDisplayTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsDisplayTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDisplayTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDisplayTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsDisplayTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDpi b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDpi
index 5613f8e..6a79e77 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDpi
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDpi
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsDpi',
test_name='cheets_CTS_P.9.0_r10.x86.CtsDpi',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDpiTestCases', '--include-filter', 'CtsDpiTestCases2', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDpiTestCases', '--include-filter', 'CtsDpiTestCases2', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsDpi',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDreamsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDreamsTestCases
index ea1470a..b3e19cd 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDreamsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDreamsTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsDreamsTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsDreamsTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDreamsTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDreamsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsDreamsTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDrmTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDrmTestCases
index ddbff9a..3edd4c6 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDrmTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDrmTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsDrmTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsDrmTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDrmTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDrmTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsDrmTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDumpsysHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDumpsysHostTestCases
index 134b5d9..d27d3b8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDumpsysHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDumpsysHostTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsDumpsysHostTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsDumpsysHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDumpsysHostTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDumpsysHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsDumpsysHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDynamicLinkerTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDynamicLinkerTestCases
index 3ac0dc3..9d77e4c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDynamicLinkerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsDynamicLinkerTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsDynamicLinkerTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsDynamicLinkerTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDynamicLinkerTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDynamicLinkerTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsDynamicLinkerTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsEdiHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsEdiHostTestCases
index 86b399b..c6a9e94 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsEdiHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsEdiHostTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsEdiHostTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsEdiHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsEdiHostTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsEdiHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsEdiHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsEffectTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsEffectTestCases
index 30feafc..9de6fba 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsEffectTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsEffectTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsEffectTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsEffectTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsEffectTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsEffectTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsEffectTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsExternalS b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsExternalS
index 7c6615c..c41ca24 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsExternalS
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsExternalS
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsExternalS',
test_name='cheets_CTS_P.9.0_r10.x86.CtsExternalS',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsExternalServiceTestCases', '--include-filter', 'CtsExternalSourcesTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsExternalServiceTestCases', '--include-filter', 'CtsExternalSourcesTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsExternalS',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsFileSystemTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsFileSystemTestCases
index ef125fa..f93b50d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsFileSystemTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsFileSystemTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsFileSystemTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsFileSystemTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsFileSystemTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsFileSystemTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsFileSystemTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsFragment b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsFragment
index 04c6675..8ca2818 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsFragment
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsFragment
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsFragment',
test_name='cheets_CTS_P.9.0_r10.x86.CtsFragment',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsFragmentTestCases', '--include-filter', 'CtsFragmentTestCasesSdk26', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsFragmentTestCases', '--include-filter', 'CtsFragmentTestCasesSdk26', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsFragment',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsGestureTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsGestureTestCases
index 1f2826d..fcb50fe 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsGestureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsGestureTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsGestureTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsGestureTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsGestureTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsGestureTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsGestureTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsGpuToolsHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsGpuToolsHostTestCases
index 04f39fe..b028274 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsGpuToolsHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsGpuToolsHostTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsGpuToolsHostTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsGpuToolsHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsGpuToolsHostTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsGpuToolsHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsGpuToolsHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsGraphicsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsGraphicsTestCases
index a0a9a07..d7081d4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsGraphicsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsGraphicsTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsGraphicsTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsGraphicsTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsGraphicsTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsGraphicsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsGraphicsTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsHardwareTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsHardwareTestCases
index 130ff5a..53f839c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsHardwareTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsHardwareTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsHardwareTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsHardwareTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsHardwareTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsHardwareTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsHardwareTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsHarmfulAppWarningHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsHarmfulAppWarningHostTestCases
index eddcd6f..11f8920 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsHarmfulAppWarningHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsHarmfulAppWarningHostTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsHarmfulAppWarningHostTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsHarmfulAppWarningHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsHarmfulAppWarningHostTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsHarmfulAppWarningHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsHarmfulAppWarningHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsHiddenApi b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsHiddenApi
index 3854e2b..31b0342 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsHiddenApi
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsHiddenApi
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsHiddenApi',
test_name='cheets_CTS_P.9.0_r10.x86.CtsHiddenApi',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHiddenApiBlacklistApi27TestCases', '--include-filter', 'CtsHiddenApiBlacklistCurrentApiTestCases', '--include-filter', 'CtsHiddenApiBlacklistDebugClassTestCases', '--include-filter', 'CtsHiddenApiKillswitchDebugClassTestCases', '--include-filter', 'CtsHiddenApiKillswitchWhitelistTestCases', '--include-filter', 'CtsHiddenApiKillswitchWildcardTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHiddenApiBlacklistApi27TestCases', '--include-filter', 'CtsHiddenApiBlacklistCurrentApiTestCases', '--include-filter', 'CtsHiddenApiBlacklistDebugClassTestCases', '--include-filter', 'CtsHiddenApiKillswitchDebugClassTestCases', '--include-filter', 'CtsHiddenApiKillswitchWhitelistTestCases', '--include-filter', 'CtsHiddenApiKillswitchWildcardTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsHiddenApi',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsHostTzDataTests b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsHostTzDataTests
index 0a5eb07..79d999f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsHostTzDataTests
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsHostTzDataTests
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsHostTzDataTests',
test_name='cheets_CTS_P.9.0_r10.x86.CtsHostTzDataTests',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsHostTzDataTests', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsHostTzDataTests', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsHostTzDataTests',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsHostside b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsHostside
index a4274ce..2d6ca6e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsHostside
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsHostside
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsHostside',
test_name='cheets_CTS_P.9.0_r10.x86.CtsHostside',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHostsideNetworkTests', '--include-filter', 'CtsHostsideNumberBlockingTestCases', '--include-filter', 'CtsHostsideTvTests', '--include-filter', 'CtsHostsideWebViewTests', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHostsideNetworkTests', '--include-filter', 'CtsHostsideNumberBlockingTestCases', '--include-filter', 'CtsHostsideTvTests', '--include-filter', 'CtsHostsideWebViewTests', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsHostside',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsIcuTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsIcuTestCases
index 5bca85c..f3ab450 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsIcuTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsIcuTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsIcuTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsIcuTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsIcuTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsIcuTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsIcuTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsIncidentHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsIncidentHostTestCases
index 9ecfcb4..5cc3385 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsIncidentHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsIncidentHostTestCases
@@ -23,8 +23,8 @@
max_retry=30,
tag='9.0_r10.x86.CtsIncidentHostTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsIncidentHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsIncidentHostTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsIncidentHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsIncidentHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsInlineMockingTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsInlineMockingTestCases
index 4d33059..e31bbaa 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsInlineMockingTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsInlineMockingTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsInlineMockingTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsInlineMockingTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsInlineMockingTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsInlineMockingTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsInlineMockingTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsInputMethod b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsInputMethod
index b185cc5..99e5c4a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsInputMethod
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsInputMethod
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsInputMethod',
test_name='cheets_CTS_P.9.0_r10.x86.CtsInputMethod',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsInputMethodServiceHostTestCases', '--include-filter', 'CtsInputMethodTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsInputMethodServiceHostTestCases', '--include-filter', 'CtsInputMethodTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsInputMethod',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsJankDeviceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsJankDeviceTestCases
index eb348e3..3f7b8b7 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsJankDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsJankDeviceTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsJankDeviceTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsJankDeviceTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsJankDeviceTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsJankDeviceTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsJankDeviceTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsJdwp b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsJdwp
index 757fd45..73e3ade 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsJdwp
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsJdwp
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsJdwp',
test_name='cheets_CTS_P.9.0_r10.x86.CtsJdwp',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJdwpSecurityHostTestCases', '--include-filter', 'CtsJdwpTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJdwpSecurityHostTestCases', '--include-filter', 'CtsJdwpTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsJdwp',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsJniTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsJniTestCases
index 4286a06..f7daccd 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsJniTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsJniTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsJniTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsJniTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsJniTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsJniTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsJniTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsJobScheduler b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsJobScheduler
index 12119c4..acc90ca 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsJobScheduler
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsJobScheduler
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsJobScheduler',
test_name='cheets_CTS_P.9.0_r10.x86.CtsJobScheduler',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJobSchedulerSharedUidTestCases', '--include-filter', 'CtsJobSchedulerTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJobSchedulerSharedUidTestCases', '--include-filter', 'CtsJobSchedulerTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsJobScheduler',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsJvmti b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsJvmti
index 403e85a..32831b8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsJvmti
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsJvmti
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsJvmti',
test_name='cheets_CTS_P.9.0_r10.x86.CtsJvmti',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiAttachingHostTestCases', '--include-filter', 'CtsJvmtiAttachingTestCases', '--include-filter', 'CtsJvmtiRedefineClassesHostTestCases', '--include-filter', 'CtsJvmtiRunTest1900HostTestCases', '--include-filter', 'CtsJvmtiRunTest1901HostTestCases', '--include-filter', 'CtsJvmtiRunTest1902HostTestCases', '--include-filter', 'CtsJvmtiRunTest1903HostTestCases', '--include-filter', 'CtsJvmtiRunTest1904HostTestCases', '--include-filter', 'CtsJvmtiRunTest1906HostTestCases', '--include-filter', 'CtsJvmtiRunTest1907HostTestCases', '--include-filter', 'CtsJvmtiRunTest1908HostTestCases', '--include-filter', 'CtsJvmtiRunTest1909HostTestCases', '--include-filter', 'CtsJvmtiRunTest1910HostTestCases', '--include-filter', 'CtsJvmtiRunTest1911HostTestCases', '--include-filter', 'CtsJvmtiRunTest1912HostTestCases', '--include-filter', 'CtsJvmtiRunTest1913HostTestCases', '--include-filter', 'CtsJvmtiRunTest1914HostTestCases', '--include-filter', 'CtsJvmtiRunTest1915HostTestCases', '--include-filter', 'CtsJvmtiRunTest1916HostTestCases', '--include-filter', 'CtsJvmtiRunTest1917HostTestCases', '--include-filter', 'CtsJvmtiRunTest1920HostTestCases', '--include-filter', 'CtsJvmtiRunTest1921HostTestCases', '--include-filter', 'CtsJvmtiRunTest1922HostTestCases', '--include-filter', 'CtsJvmtiRunTest1923HostTestCases', '--include-filter', 'CtsJvmtiRunTest1924HostTestCases', '--include-filter', 'CtsJvmtiRunTest1925HostTestCases', '--include-filter', 'CtsJvmtiRunTest1926HostTestCases', '--include-filter', 'CtsJvmtiRunTest1927HostTestCases', '--include-filter', 'CtsJvmtiRunTest1928HostTestCases', '--include-filter', 'CtsJvmtiRunTest1930HostTestCases', '--include-filter', 'CtsJvmtiRunTest1931HostTestCases', '--include-filter', 'CtsJvmtiRunTest1932HostTestCases', '--include-filter', 'CtsJvmtiRunTest1933HostTestCases', '--include-filter', 'CtsJvmtiRunTest1934HostTestCases', '--include-filter', 'CtsJvmtiRunTest1936HostTestCases', '--include-filter', 'CtsJvmtiRunTest1937HostTestCases', '--include-filter', 'CtsJvmtiRunTest1939HostTestCases', '--include-filter', 'CtsJvmtiRunTest1941HostTestCases', '--include-filter', 'CtsJvmtiRunTest1942HostTestCases', '--include-filter', 'CtsJvmtiRunTest1943HostTestCases', '--include-filter', 'CtsJvmtiRunTest902HostTestCases', '--include-filter', 'CtsJvmtiRunTest903HostTestCases', '--include-filter', 'CtsJvmtiRunTest904HostTestCases', '--include-filter', 'CtsJvmtiRunTest905HostTestCases', '--include-filter', 'CtsJvmtiRunTest906HostTestCases', '--include-filter', 'CtsJvmtiRunTest907HostTestCases', '--include-filter', 'CtsJvmtiRunTest908HostTestCases', '--include-filter', 'CtsJvmtiRunTest910HostTestCases', '--include-filter', 'CtsJvmtiRunTest911HostTestCases', '--include-filter', 'CtsJvmtiRunTest912HostTestCases', '--include-filter', 'CtsJvmtiRunTest913HostTestCases', '--include-filter', 'CtsJvmtiRunTest914HostTestCases', '--include-filter', 'CtsJvmtiRunTest915HostTestCases', '--include-filter', 'CtsJvmtiRunTest917HostTestCases', '--include-filter', 'CtsJvmtiRunTest918HostTestCases', '--include-filter', 'CtsJvmtiRunTest919HostTestCases', '--include-filter', 'CtsJvmtiRunTest920HostTestCases', '--include-filter', 'CtsJvmtiRunTest922HostTestCases', '--include-filter', 'CtsJvmtiRunTest923HostTestCases', '--include-filter', 'CtsJvmtiRunTest924HostTestCases', '--include-filter', 'CtsJvmtiRunTest926HostTestCases', '--include-filter', 'CtsJvmtiRunTest927HostTestCases', '--include-filter', 'CtsJvmtiRunTest928HostTestCases', '--include-filter', 'CtsJvmtiRunTest930HostTestCases', '--include-filter', 'CtsJvmtiRunTest931HostTestCases', '--include-filter', 'CtsJvmtiRunTest932HostTestCases', '--include-filter', 'CtsJvmtiRunTest940HostTestCases', '--include-filter', 'CtsJvmtiRunTest942HostTestCases', '--include-filter', 'CtsJvmtiRunTest944HostTestCases', '--include-filter', 'CtsJvmtiRunTest945HostTestCases', '--include-filter', 'CtsJvmtiRunTest947HostTestCases', '--include-filter', 'CtsJvmtiRunTest951HostTestCases', '--include-filter', 'CtsJvmtiRunTest982HostTestCases', '--include-filter', 'CtsJvmtiRunTest983HostTestCases', '--include-filter', 'CtsJvmtiRunTest984HostTestCases', '--include-filter', 'CtsJvmtiRunTest985HostTestCases', '--include-filter', 'CtsJvmtiRunTest986HostTestCases', '--include-filter', 'CtsJvmtiRunTest988HostTestCases', '--include-filter', 'CtsJvmtiRunTest989HostTestCases', '--include-filter', 'CtsJvmtiRunTest990HostTestCases', '--include-filter', 'CtsJvmtiRunTest991HostTestCases', '--include-filter', 'CtsJvmtiRunTest992HostTestCases', '--include-filter', 'CtsJvmtiRunTest993HostTestCases', '--include-filter', 'CtsJvmtiRunTest994HostTestCases', '--include-filter', 'CtsJvmtiRunTest995HostTestCases', '--include-filter', 'CtsJvmtiRunTest996HostTestCases', '--include-filter', 'CtsJvmtiRunTest997HostTestCases', '--include-filter', 'CtsJvmtiTaggingHostTestCases', '--include-filter', 'CtsJvmtiTrackingHostTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiAttachingHostTestCases', '--include-filter', 'CtsJvmtiAttachingTestCases', '--include-filter', 'CtsJvmtiRedefineClassesHostTestCases', '--include-filter', 'CtsJvmtiRunTest1900HostTestCases', '--include-filter', 'CtsJvmtiRunTest1901HostTestCases', '--include-filter', 'CtsJvmtiRunTest1902HostTestCases', '--include-filter', 'CtsJvmtiRunTest1903HostTestCases', '--include-filter', 'CtsJvmtiRunTest1904HostTestCases', '--include-filter', 'CtsJvmtiRunTest1906HostTestCases', '--include-filter', 'CtsJvmtiRunTest1907HostTestCases', '--include-filter', 'CtsJvmtiRunTest1908HostTestCases', '--include-filter', 'CtsJvmtiRunTest1909HostTestCases', '--include-filter', 'CtsJvmtiRunTest1910HostTestCases', '--include-filter', 'CtsJvmtiRunTest1911HostTestCases', '--include-filter', 'CtsJvmtiRunTest1912HostTestCases', '--include-filter', 'CtsJvmtiRunTest1913HostTestCases', '--include-filter', 'CtsJvmtiRunTest1914HostTestCases', '--include-filter', 'CtsJvmtiRunTest1915HostTestCases', '--include-filter', 'CtsJvmtiRunTest1916HostTestCases', '--include-filter', 'CtsJvmtiRunTest1917HostTestCases', '--include-filter', 'CtsJvmtiRunTest1920HostTestCases', '--include-filter', 'CtsJvmtiRunTest1921HostTestCases', '--include-filter', 'CtsJvmtiRunTest1922HostTestCases', '--include-filter', 'CtsJvmtiRunTest1923HostTestCases', '--include-filter', 'CtsJvmtiRunTest1924HostTestCases', '--include-filter', 'CtsJvmtiRunTest1925HostTestCases', '--include-filter', 'CtsJvmtiRunTest1926HostTestCases', '--include-filter', 'CtsJvmtiRunTest1927HostTestCases', '--include-filter', 'CtsJvmtiRunTest1928HostTestCases', '--include-filter', 'CtsJvmtiRunTest1930HostTestCases', '--include-filter', 'CtsJvmtiRunTest1931HostTestCases', '--include-filter', 'CtsJvmtiRunTest1932HostTestCases', '--include-filter', 'CtsJvmtiRunTest1933HostTestCases', '--include-filter', 'CtsJvmtiRunTest1934HostTestCases', '--include-filter', 'CtsJvmtiRunTest1936HostTestCases', '--include-filter', 'CtsJvmtiRunTest1937HostTestCases', '--include-filter', 'CtsJvmtiRunTest1939HostTestCases', '--include-filter', 'CtsJvmtiRunTest1941HostTestCases', '--include-filter', 'CtsJvmtiRunTest1942HostTestCases', '--include-filter', 'CtsJvmtiRunTest1943HostTestCases', '--include-filter', 'CtsJvmtiRunTest902HostTestCases', '--include-filter', 'CtsJvmtiRunTest903HostTestCases', '--include-filter', 'CtsJvmtiRunTest904HostTestCases', '--include-filter', 'CtsJvmtiRunTest905HostTestCases', '--include-filter', 'CtsJvmtiRunTest906HostTestCases', '--include-filter', 'CtsJvmtiRunTest907HostTestCases', '--include-filter', 'CtsJvmtiRunTest908HostTestCases', '--include-filter', 'CtsJvmtiRunTest910HostTestCases', '--include-filter', 'CtsJvmtiRunTest911HostTestCases', '--include-filter', 'CtsJvmtiRunTest912HostTestCases', '--include-filter', 'CtsJvmtiRunTest913HostTestCases', '--include-filter', 'CtsJvmtiRunTest914HostTestCases', '--include-filter', 'CtsJvmtiRunTest915HostTestCases', '--include-filter', 'CtsJvmtiRunTest917HostTestCases', '--include-filter', 'CtsJvmtiRunTest918HostTestCases', '--include-filter', 'CtsJvmtiRunTest919HostTestCases', '--include-filter', 'CtsJvmtiRunTest920HostTestCases', '--include-filter', 'CtsJvmtiRunTest922HostTestCases', '--include-filter', 'CtsJvmtiRunTest923HostTestCases', '--include-filter', 'CtsJvmtiRunTest924HostTestCases', '--include-filter', 'CtsJvmtiRunTest926HostTestCases', '--include-filter', 'CtsJvmtiRunTest927HostTestCases', '--include-filter', 'CtsJvmtiRunTest928HostTestCases', '--include-filter', 'CtsJvmtiRunTest930HostTestCases', '--include-filter', 'CtsJvmtiRunTest931HostTestCases', '--include-filter', 'CtsJvmtiRunTest932HostTestCases', '--include-filter', 'CtsJvmtiRunTest940HostTestCases', '--include-filter', 'CtsJvmtiRunTest942HostTestCases', '--include-filter', 'CtsJvmtiRunTest944HostTestCases', '--include-filter', 'CtsJvmtiRunTest945HostTestCases', '--include-filter', 'CtsJvmtiRunTest947HostTestCases', '--include-filter', 'CtsJvmtiRunTest951HostTestCases', '--include-filter', 'CtsJvmtiRunTest982HostTestCases', '--include-filter', 'CtsJvmtiRunTest983HostTestCases', '--include-filter', 'CtsJvmtiRunTest984HostTestCases', '--include-filter', 'CtsJvmtiRunTest985HostTestCases', '--include-filter', 'CtsJvmtiRunTest986HostTestCases', '--include-filter', 'CtsJvmtiRunTest988HostTestCases', '--include-filter', 'CtsJvmtiRunTest989HostTestCases', '--include-filter', 'CtsJvmtiRunTest990HostTestCases', '--include-filter', 'CtsJvmtiRunTest991HostTestCases', '--include-filter', 'CtsJvmtiRunTest992HostTestCases', '--include-filter', 'CtsJvmtiRunTest993HostTestCases', '--include-filter', 'CtsJvmtiRunTest994HostTestCases', '--include-filter', 'CtsJvmtiRunTest995HostTestCases', '--include-filter', 'CtsJvmtiRunTest996HostTestCases', '--include-filter', 'CtsJvmtiRunTest997HostTestCases', '--include-filter', 'CtsJvmtiTaggingHostTestCases', '--include-filter', 'CtsJvmtiTrackingHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsJvmti',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsKernelConfigTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsKernelConfigTestCases
index e1e2a46..e87a9bc 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsKernelConfigTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsKernelConfigTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsKernelConfigTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsKernelConfigTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsKernelConfigTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsKernelConfigTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsKernelConfigTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsKeystoreTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsKeystoreTestCases
index 2144af2..bf72c20 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsKeystoreTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsKeystoreTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsKeystoreTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsKeystoreTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsKeystoreTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsKeystoreTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsKeystoreTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsLeanbackJankTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsLeanbackJankTestCases
index 8b8fa4e..bd542fa 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsLeanbackJankTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsLeanbackJankTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsLeanbackJankTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsLeanbackJankTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsLeanbackJankTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsLeanbackJankTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsLeanbackJankTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsLegacyNotificationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsLegacyNotificationTestCases
index b6c6db6..4544c8e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsLegacyNotificationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsLegacyNotificationTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsLegacyNotificationTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsLegacyNotificationTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsLegacyNotificationTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsLegacyNotificationTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsLegacyNotificationTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsLibcore b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsLibcore
index 7c3bc10..f640bbc 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsLibcore
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsLibcore
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsLibcore',
test_name='cheets_CTS_P.9.0_r10.x86.CtsLibcore',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLibcoreFileIOTestCases', '--include-filter', 'CtsLibcoreJsr166TestCases', '--include-filter', 'CtsLibcoreLegacy22TestCases', '--include-filter', 'CtsLibcoreOjTestCases', '--include-filter', 'CtsLibcoreOkHttpTestCases', '--include-filter', 'CtsLibcoreTestCases', '--include-filter', 'CtsLibcoreWycheproofBCTestCases', '--include-filter', 'CtsLibcoreWycheproofConscryptTestCases'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLibcoreFileIOTestCases', '--include-filter', 'CtsLibcoreJsr166TestCases', '--include-filter', 'CtsLibcoreLegacy22TestCases', '--include-filter', 'CtsLibcoreOjTestCases', '--include-filter', 'CtsLibcoreOkHttpTestCases', '--include-filter', 'CtsLibcoreTestCases', '--include-filter', 'CtsLibcoreWycheproofBCTestCases', '--include-filter', 'CtsLibcoreWycheproofConscryptTestCases', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsLibcore',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsLiblogTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsLiblogTestCases
index 846a3fb..5e1d8f9 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsLiblogTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsLiblogTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsLiblogTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsLiblogTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsLiblogTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsLiblogTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsLiblogTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsLocation b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsLocation
index 2b20515..1c8b060 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsLocation
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsLocation
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsLocation',
test_name='cheets_CTS_P.9.0_r10.x86.CtsLocation',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLocation2TestCases', '--include-filter', 'CtsLocationTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLocation2TestCases', '--include-filter', 'CtsLocationTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsLocation',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsLogdTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsLogdTestCases
index 77a8e08..c98df1e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsLogdTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsLogdTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsLogdTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsLogdTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsLogdTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsLogdTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsLogdTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsMediaHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsMediaHostTestCases
index 1099ff6..9739ed0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsMediaHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsMediaHostTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsMediaHostTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsMediaHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaHostTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsMediaHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsMidiTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsMidiTestCases
index fc27c1a..9ee303a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsMidiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsMidiTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsMidiTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsMidiTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMidiTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMidiTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsMidiTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsMocking b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsMocking
index 11039a9..730ea51 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsMocking
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsMocking
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsMocking',
test_name='cheets_CTS_P.9.0_r10.x86.CtsMocking',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMockingDebuggableTestCases', '--include-filter', 'CtsMockingTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMockingDebuggableTestCases', '--include-filter', 'CtsMockingTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsMocking',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsMonkeyTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsMonkeyTestCases
index 0ccc2a0..35a6f82 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsMonkeyTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsMonkeyTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsMonkeyTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsMonkeyTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMonkeyTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMonkeyTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsMonkeyTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsMultiUser b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsMultiUser
index afb2624..9c4ef06 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsMultiUser
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsMultiUser
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsMultiUser',
test_name='cheets_CTS_P.9.0_r10.x86.CtsMultiUser',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMultiUserHostTestCases', '--include-filter', 'CtsMultiUserTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMultiUserHostTestCases', '--include-filter', 'CtsMultiUserTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsMultiUser',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsNNAPITestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsNNAPITestCases
index 11271f7..a11c29b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsNNAPITestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsNNAPITestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsNNAPITestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsNNAPITestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsNNAPITestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsNNAPITestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsNNAPITestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsNative b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsNative
index a87ddb6..5056252 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsNative
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsNative
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsNative',
test_name='cheets_CTS_P.9.0_r10.x86.CtsNative',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNativeHardwareTestCases', '--include-filter', 'CtsNativeMediaAAudioTestCases', '--include-filter', 'CtsNativeMediaSlTestCases', '--include-filter', 'CtsNativeMediaXaTestCases', '--include-filter', 'CtsNativeNetTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNativeHardwareTestCases', '--include-filter', 'CtsNativeMediaAAudioTestCases', '--include-filter', 'CtsNativeMediaSlTestCases', '--include-filter', 'CtsNativeMediaXaTestCases', '--include-filter', 'CtsNativeNetTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsNative',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsNdefTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsNdefTestCases
index 886960c..c77d6a2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsNdefTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsNdefTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsNdefTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsNdefTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsNdefTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsNdefTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsNdefTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsNet b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsNet
index 0f27cdf..b0880fa 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsNet
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsNet
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsNet',
test_name='cheets_CTS_P.9.0_r10.x86.CtsNet',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecConfigAttributeTestCases', '--include-filter', 'CtsNetSecConfigBasicDebugDisabledTestCases', '--include-filter', 'CtsNetSecConfigBasicDebugEnabledTestCases', '--include-filter', 'CtsNetSecConfigBasicDomainConfigTestCases', '--include-filter', 'CtsNetSecConfigCleartextTrafficTestCases', '--include-filter', 'CtsNetSecConfigDownloadManagerTestCases', '--include-filter', 'CtsNetSecConfigInvalidPinTestCases', '--include-filter', 'CtsNetSecConfigNestedDomainConfigTestCases', '--include-filter', 'CtsNetSecConfigPrePCleartextTrafficTestCases', '--include-filter', 'CtsNetSecConfigResourcesSrcTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficFalseTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficTrueTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases', '--include-filter', 'CtsNetTestCases', '--include-filter', 'CtsNetTestCasesLegacyApi22', '--include-filter', 'CtsNetTestCasesLegacyPermission22', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecConfigAttributeTestCases', '--include-filter', 'CtsNetSecConfigBasicDebugDisabledTestCases', '--include-filter', 'CtsNetSecConfigBasicDebugEnabledTestCases', '--include-filter', 'CtsNetSecConfigBasicDomainConfigTestCases', '--include-filter', 'CtsNetSecConfigCleartextTrafficTestCases', '--include-filter', 'CtsNetSecConfigDownloadManagerTestCases', '--include-filter', 'CtsNetSecConfigInvalidPinTestCases', '--include-filter', 'CtsNetSecConfigNestedDomainConfigTestCases', '--include-filter', 'CtsNetSecConfigPrePCleartextTrafficTestCases', '--include-filter', 'CtsNetSecConfigResourcesSrcTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficFalseTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficTrueTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases', '--include-filter', 'CtsNetTestCases', '--include-filter', 'CtsNetTestCasesLegacyApi22', '--include-filter', 'CtsNetTestCasesLegacyPermission22', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsNet',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsOmapiTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsOmapiTestCases
index 27462da..d00e9ea 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsOmapiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsOmapiTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsOmapiTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsOmapiTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsOmapiTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsOmapiTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsOmapiTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsOpenG b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsOpenG
index 6f54d3c..06c015e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsOpenG
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsOpenG
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsOpenG',
test_name='cheets_CTS_P.9.0_r10.x86.CtsOpenG',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsOpenGLTestCases', '--include-filter', 'CtsOpenGlPerf2TestCases', '--include-filter', 'CtsOpenGlPerfTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsOpenGLTestCases', '--include-filter', 'CtsOpenGlPerf2TestCases', '--include-filter', 'CtsOpenGlPerfTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsOpenG',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsOs b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsOs
index d75ba1b..fd17cf2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsOs
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsOs
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsOs',
test_name='cheets_CTS_P.9.0_r10.x86.CtsOs',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsOsHostTestCases', '--include-filter', 'CtsOsTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsOsHostTestCases', '--include-filter', 'CtsOsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsOs',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsPdfTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsPdfTestCases
index 95853bf..8a4a6de 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsPdfTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsPdfTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsPdfTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsPdfTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsPdfTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsPdfTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsPdfTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsPerfettoTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsPerfettoTestCases
index b6420af..971a2d8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsPerfettoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsPerfettoTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsPerfettoTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsPerfettoTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsPerfettoTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsPerfettoTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsPerfettoTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsPermission b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsPermission
index dc4782b..c9a22d2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsPermission
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsPermission
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsPermission',
test_name='cheets_CTS_P.9.0_r10.x86.CtsPermission',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPermission2TestCases', '--include-filter', 'CtsPermissionTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPermission2TestCases', '--include-filter', 'CtsPermissionTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsPermission',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsPreference b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsPreference
index 98b4c66..5b02d99 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsPreference
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsPreference
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsPreference',
test_name='cheets_CTS_P.9.0_r10.x86.CtsPreference',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPreference2TestCases', '--include-filter', 'CtsPreferenceTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPreference2TestCases', '--include-filter', 'CtsPreferenceTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsPreference',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsPrintTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsPrintTestCases
index 949154e..4b2e8cc 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsPrintTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsPrintTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsPrintTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsPrintTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsPrintTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsPrintTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsPrintTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsProtoTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsProtoTestCases
index 611c922..68474dc 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsProtoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsProtoTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsProtoTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsProtoTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsProtoTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsProtoTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsProtoTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsProviderTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsProviderTestCases
index 4d75e28..38e97b4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsProviderTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsProviderTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsProviderTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsProviderTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsProviderTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsProviderTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsProviderTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsRenderscript b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsRenderscript
index 6822828..8827f24 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsRenderscript
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsRenderscript
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsRenderscript',
test_name='cheets_CTS_P.9.0_r10.x86.CtsRenderscript',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsRenderscriptLegacyTestCases', '--include-filter', 'CtsRenderscriptTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsRenderscriptLegacyTestCases', '--include-filter', 'CtsRenderscriptTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsRenderscript',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsRs b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsRs
index b9bbeb0..65dd1b0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsRs
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsRs
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsRs',
test_name='cheets_CTS_P.9.0_r10.x86.CtsRs',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsRsBlasTestCases', '--include-filter', 'CtsRsCppTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsRsBlasTestCases', '--include-filter', 'CtsRsCppTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsRs',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSample b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSample
index 76ac5ea..5e699b6 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSample
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSample
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsSample',
test_name='cheets_CTS_P.9.0_r10.x86.CtsSample',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSampleDeviceTestCases', '--include-filter', 'CtsSampleHostTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSampleDeviceTestCases', '--include-filter', 'CtsSampleHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsSample',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSaxTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSaxTestCases
index e79c792..40a29ae 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSaxTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSaxTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsSaxTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsSaxTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSaxTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSaxTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsSaxTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSeccompHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSeccompHostTestCases
index 4066fce..5fa2065 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSeccompHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSeccompHostTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsSeccompHostTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsSeccompHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSeccompHostTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSeccompHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsSeccompHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSecureElementAccessControl b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSecureElementAccessControl
index 00163a9..75aa5a6 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSecureElementAccessControl
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSecureElementAccessControl
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsSecureElementAccessControl',
test_name='cheets_CTS_P.9.0_r10.x86.CtsSecureElementAccessControl',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecureElementAccessControlTestCases1', '--include-filter', 'CtsSecureElementAccessControlTestCases2', '--include-filter', 'CtsSecureElementAccessControlTestCases3', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecureElementAccessControlTestCases1', '--include-filter', 'CtsSecureElementAccessControlTestCases2', '--include-filter', 'CtsSecureElementAccessControlTestCases3', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsSecureElementAccessControl',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSecurity b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSecurity
index cb7f70f..52ca8fd 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSecurity
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSecurity
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsSecurity',
test_name='cheets_CTS_P.9.0_r10.x86.CtsSecurity',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecurityBulletinHostTestCases', '--include-filter', 'CtsSecurityHostTestCases', '--include-filter', 'CtsSecurityTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecurityBulletinHostTestCases', '--include-filter', 'CtsSecurityHostTestCases', '--include-filter', 'CtsSecurityTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsSecurity',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSelinuxTargetSdk b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSelinuxTargetSdk
index b01df6d..cd300e5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSelinuxTargetSdk
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSelinuxTargetSdk
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsSelinuxTargetSdk',
test_name='cheets_CTS_P.9.0_r10.x86.CtsSelinuxTargetSdk',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSelinuxTargetSdk25TestCases', '--include-filter', 'CtsSelinuxTargetSdk27TestCases', '--include-filter', 'CtsSelinuxTargetSdkCurrentTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSelinuxTargetSdk25TestCases', '--include-filter', 'CtsSelinuxTargetSdk27TestCases', '--include-filter', 'CtsSelinuxTargetSdkCurrentTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsSelinuxTargetSdk',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSensorTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSensorTestCases
index 18bf26a..2ea8c84 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSensorTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSensorTestCases
@@ -23,8 +23,8 @@
max_retry=30,
tag='9.0_r10.x86.CtsSensorTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsSensorTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSensorTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSensorTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsSensorTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsShortcut b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsShortcut
index 26df70e..bb7520a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsShortcut
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsShortcut
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsShortcut',
test_name='cheets_CTS_P.9.0_r10.x86.CtsShortcut',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsShortcutHostTestCases', '--include-filter', 'CtsShortcutManagerTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsShortcutHostTestCases', '--include-filter', 'CtsShortcutManagerTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsShortcut',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSimRestrictedApisTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSimRestrictedApisTestCases
index 4c33236..0a3e37a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSimRestrictedApisTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSimRestrictedApisTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsSimRestrictedApisTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsSimRestrictedApisTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSimRestrictedApisTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSimRestrictedApisTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsSimRestrictedApisTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSimpleCpuTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSimpleCpuTestCases
index f96b498..1513d46 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSimpleCpuTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSimpleCpuTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsSimpleCpuTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsSimpleCpuTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSimpleCpuTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSimpleCpuTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsSimpleCpuTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSimpleperfTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSimpleperfTestCases
index 34d41a8..c10a5c3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSimpleperfTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSimpleperfTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsSimpleperfTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsSimpleperfTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSimpleperfTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSimpleperfTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsSimpleperfTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSkQPTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSkQPTestCases
index 7083b72..969b4e0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSkQPTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSkQPTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsSkQPTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsSkQPTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSkQPTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSkQPTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsSkQPTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSliceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSliceTestCases
index fdd39ee..f992b96 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSliceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSliceTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsSliceTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsSliceTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSliceTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSliceTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsSliceTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSpeechTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSpeechTestCases
index cfa2954..51852d3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSpeechTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSpeechTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsSpeechTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsSpeechTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSpeechTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSpeechTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsSpeechTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsStatsdHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsStatsdHostTestCases
index af791fc..b9ab03f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsStatsdHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsStatsdHostTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsStatsdHostTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsStatsdHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsStatsdHostTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsStatsdHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsStatsdHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSustainedPerformanceHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSustainedPerformanceHostTestCases
index ebcdf27..d36adaa 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSustainedPerformanceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSustainedPerformanceHostTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsSustainedPerformanceHostTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsSustainedPerformanceHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSustainedPerformanceHostTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSustainedPerformanceHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsSustainedPerformanceHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSync b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSync
index 9f55402..3b5ad42 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSync
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSync
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsSync',
test_name='cheets_CTS_P.9.0_r10.x86.CtsSync',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSyncAccountAccessOtherCertTestCases', '--include-filter', 'CtsSyncContentHostTestCases', '--include-filter', 'CtsSyncManagerTestsCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSyncAccountAccessOtherCertTestCases', '--include-filter', 'CtsSyncContentHostTestCases', '--include-filter', 'CtsSyncManagerTestsCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsSync',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSystem b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSystem
index b7a4eca..1e1410e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSystem
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsSystem
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsSystem',
test_name='cheets_CTS_P.9.0_r10.x86.CtsSystem',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSystemApiAnnotationTestCases', '--include-filter', 'CtsSystemApiSignatureTestCases', '--include-filter', 'CtsSystemIntentTestCases', '--include-filter', 'CtsSystemUiHostTestCases', '--include-filter', 'CtsSystemUiTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSystemApiAnnotationTestCases', '--include-filter', 'CtsSystemApiSignatureTestCases', '--include-filter', 'CtsSystemIntentTestCases', '--include-filter', 'CtsSystemUiHostTestCases', '--include-filter', 'CtsSystemUiTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsSystem',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsTelecom b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsTelecom
index 0ef7e81..df30bfd 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsTelecom
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsTelecom
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsTelecom',
test_name='cheets_CTS_P.9.0_r10.x86.CtsTelecom',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTelecomTestCases', '--include-filter', 'CtsTelecomTestCases2', '--include-filter', 'CtsTelecomTestCases3', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTelecomTestCases', '--include-filter', 'CtsTelecomTestCases2', '--include-filter', 'CtsTelecomTestCases3', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsTelecom',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsTelephony b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsTelephony
index 9f8bd8a..fa8304d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsTelephony
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsTelephony
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsTelephony',
test_name='cheets_CTS_P.9.0_r10.x86.CtsTelephony',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTelephony2TestCases', '--include-filter', 'CtsTelephonyTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTelephony2TestCases', '--include-filter', 'CtsTelephonyTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsTelephony',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsTextTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsTextTestCases
index e5f5d09..791ae69 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsTextTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsTextTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsTextTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsTextTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsTextTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsTextTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsTextTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsTheme b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsTheme
index 62acd19..4515978 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsTheme
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsTheme
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsTheme',
test_name='cheets_CTS_P.9.0_r10.x86.CtsTheme',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsThemeDeviceTestCases', '--include-filter', 'CtsThemeHostTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsThemeDeviceTestCases', '--include-filter', 'CtsThemeHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsTheme',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsToast b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsToast
index 62de34f..24807f5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsToast
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsToast
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsToast',
test_name='cheets_CTS_P.9.0_r10.x86.CtsToast',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsToastLegacyTestCases', '--include-filter', 'CtsToastTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsToastLegacyTestCases', '--include-filter', 'CtsToastTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsToast',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsTransitionTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsTransitionTestCases
index f89b840..007890f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsTransitionTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsTransitionTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsTransitionTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsTransitionTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsTransitionTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsTransitionTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsTransitionTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsTrustedVoiceHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsTrustedVoiceHostTestCases
index bac7ea5..54fdcd8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsTrustedVoiceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsTrustedVoiceHostTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsTrustedVoiceHostTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsTrustedVoiceHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsTrustedVoiceHostTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsTrustedVoiceHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsTrustedVoiceHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsTv b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsTv
index 29a4404..0173137 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsTv
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsTv
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsTv',
test_name='cheets_CTS_P.9.0_r10.x86.CtsTv',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTvProviderTestCases', '--include-filter', 'CtsTvTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTvProviderTestCases', '--include-filter', 'CtsTvTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsTv',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsUi b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsUi
index 89918f7..9ac16e1 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsUi
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsUi
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsUi',
test_name='cheets_CTS_P.9.0_r10.x86.CtsUi',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUiAutomationTestCases', '--include-filter', 'CtsUiDeviceTestCases', '--include-filter', 'CtsUiRenderingTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUiAutomationTestCases', '--include-filter', 'CtsUiDeviceTestCases', '--include-filter', 'CtsUiRenderingTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsUi',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsUidIsolationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsUidIsolationTestCases
index 1e86654..e6c2268 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsUidIsolationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsUidIsolationTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsUidIsolationTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsUidIsolationTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsUidIsolationTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsUidIsolationTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsUidIsolationTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsUsageStatsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsUsageStatsTestCases
index 62ad5d6..9d0d74d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsUsageStatsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsUsageStatsTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsUsageStatsTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsUsageStatsTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsUsageStatsTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsUsageStatsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsUsageStatsTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsUsbTests b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsUsbTests
index 5891670..7665a0e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsUsbTests
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsUsbTests
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsUsbTests',
test_name='cheets_CTS_P.9.0_r10.x86.CtsUsbTests',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsUsbTests', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsUsbTests', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsUsbTests',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsUtilTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsUtilTestCases
index ef659d6..b95de5a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsUtilTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsUtilTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsUtilTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsUtilTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsUtilTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsUtilTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsUtilTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsVideoTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsVideoTestCases
index 0a851b0..a8bf88d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsVideoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsVideoTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsVideoTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsVideoTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsVideoTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsVideoTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsVideoTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsViewTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsViewTestCases
index 3d5bffb..129d8ff 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsViewTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsViewTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsViewTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsViewTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsViewTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsViewTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsViewTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsVmTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsVmTestCases
index a40cecb..2e51cb4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsVmTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsVmTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsVmTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsVmTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsVmTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsVmTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsVmTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsVoice b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsVoice
index 9461622..efe83e4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsVoice
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsVoice
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsVoice',
test_name='cheets_CTS_P.9.0_r10.x86.CtsVoice',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsVoiceInteractionTestCases', '--include-filter', 'CtsVoiceSettingsTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsVoiceInteractionTestCases', '--include-filter', 'CtsVoiceSettingsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsVoice',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsVrTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsVrTestCases
index d0c8f43..5ce4544 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsVrTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsVrTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsVrTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsVrTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsVrTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsVrTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsVrTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsWebkitTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsWebkitTestCases
index 4f37006..3e1c776 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsWebkitTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsWebkitTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsWebkitTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsWebkitTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsWebkitTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsWebkitTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsWebkitTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsWidgetTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsWidgetTestCases
index 38ac693..665e52e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsWidgetTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsWidgetTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsWidgetTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsWidgetTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsWidgetTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsWidgetTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsWidgetTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsWindowManagerDeviceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsWindowManagerDeviceTestCases
index cdcafcb..0560f66 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsWindowManagerDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsWindowManagerDeviceTestCases
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsWindowManagerDeviceTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.CtsWindowManagerDeviceTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsWindowManagerDeviceTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsWindowManagerDeviceTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsWindowManagerDeviceTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsWrap b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsWrap
index 6113211..8bb1153 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsWrap
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsWrap
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.CtsWrap',
test_name='cheets_CTS_P.9.0_r10.x86.CtsWrap',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsWrapNoWrapTestCases', '--include-filter', 'CtsWrapWrapDebugMallocDebugTestCases', '--include-filter', 'CtsWrapWrapDebugTestCases', '--include-filter', 'CtsWrapWrapNoDebugTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsWrapNoWrapTestCases', '--include-filter', 'CtsWrapWrapDebugMallocDebugTestCases', '--include-filter', 'CtsWrapWrapDebugTestCases', '--include-filter', 'CtsWrapWrapNoDebugTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsWrap',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases
index 0ef993f..d7977b5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases
@@ -23,8 +23,8 @@
max_retry=9,
tag='9.0_r10.x86.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAbiOverrideHostTestCases', '--include-filter', 'CtsAccelerationTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAbiOverrideHostTestCases', '--include-filter', 'CtsAccelerationTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='all.CtsAbiOverrideHostTestCases_-_CtsAccelerationTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases
index 1912294..f4d4d75 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases
@@ -23,8 +23,8 @@
max_retry=9,
tag='9.0_r10.x86.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAccessibilityServiceTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAccessibilityServiceTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='all.CtsAccessibilityServiceTestCases_-_CtsAccessibilityServiceTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases
index ccbbafa..f99955d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases
@@ -23,8 +23,8 @@
max_retry=9,
tag='9.0_r10.x86.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAccessibilityTestCases', '--include-filter', 'CtsAccountManagerTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAccessibilityTestCases', '--include-filter', 'CtsAccountManagerTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='all.CtsAccessibilityTestCases_-_CtsAccountManagerTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases
index 2cab44c..c55ce3b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases
@@ -23,8 +23,8 @@
max_retry=9,
tag='9.0_r10.x86.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsActivityManagerDeviceSdk25TestCases', '--include-filter', 'CtsActivityManagerDeviceTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsActivityManagerDeviceSdk25TestCases', '--include-filter', 'CtsActivityManagerDeviceTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='all.CtsActivityManagerDeviceSdk25TestCases_-_CtsActivityManagerDeviceTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases
index ff8634b..ad5264a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases
@@ -24,8 +24,8 @@
enable_default_apps=True,
tag='9.0_r10.x86.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAdminPackageInstallerTestCases', '--include-filter', 'CtsAdminTestCases', '--include-filter', 'CtsAlarmClockTestCases', '--include-filter', 'CtsAlarmManagerTestCases', '--include-filter', 'CtsAndroidAppTestCases', '--include-filter', 'CtsAndroidTestBase27ApiSignatureTestCases', '--include-filter', 'CtsAndroidTestMockCurrentApiSignatureTestCases', '--include-filter', 'CtsAndroidTestRunnerCurrentApiSignatureTestCases', '--include-filter', 'CtsAnimationTestCases', '--include-filter', 'CtsApacheHttpLegacy27ApiSignatureTestCases', '--include-filter', 'CtsApacheHttpLegacyCurrentApiSignatureTestCases', '--include-filter', 'CtsApacheHttpLegacyUsesLibraryApiSignatureTestCases', '--include-filter', 'CtsAppComponentFactoryTestCases', '--include-filter', 'CtsAppSecurityHostTestCases', '--include-filter', 'CtsAppTestCases', '--include-filter', 'CtsAppUsageHostTestCases', '--include-filter', 'CtsAppWidgetTestCases', '--include-filter', 'CtsAslrMallocTestCases', '--include-filter', 'CtsAssistTestCases', '--include-filter', 'CtsAtraceHostTestCases', '--include-filter', 'CtsAutoFillServiceTestCases', '--include-filter', 'CtsBackgroundRestrictionsTestCases', '--include-filter', 'CtsBackupHostTestCases', '--include-filter', 'CtsBackupTestCases', '--include-filter', 'CtsBatterySavingTestCases', '--include-filter', 'CtsBionicTestCases', '--include-filter', 'CtsBluetoothTestCases', '--include-filter', 'CtsBootStatsTestCases', '--include-filter', 'CtsCalendarcommon2TestCases', '--include-filter', 'CtsCameraApi25TestCases', '--include-filter', 'CtsCameraTestCases', '--include-filter', 'CtsCarTestCases', '--include-filter', 'CtsCarrierApiTestCases', '--include-filter', 'CtsColorModeTestCases', '--include-filter', 'CtsCompilationTestCases', '--include-filter', 'CtsContactsProviderWipe', '--include-filter', 'CtsContentTestCases', '--include-filter', 'CtsCppToolsTestCases', '--include-filter', 'CtsCurrentApiSignatureTestCases', '--include-filter', 'CtsDatabaseTestCases', '--include-filter', 'CtsDebugTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAdminPackageInstallerTestCases', '--include-filter', 'CtsAdminTestCases', '--include-filter', 'CtsAlarmClockTestCases', '--include-filter', 'CtsAlarmManagerTestCases', '--include-filter', 'CtsAndroidAppTestCases', '--include-filter', 'CtsAndroidTestBase27ApiSignatureTestCases', '--include-filter', 'CtsAndroidTestMockCurrentApiSignatureTestCases', '--include-filter', 'CtsAndroidTestRunnerCurrentApiSignatureTestCases', '--include-filter', 'CtsAnimationTestCases', '--include-filter', 'CtsApacheHttpLegacy27ApiSignatureTestCases', '--include-filter', 'CtsApacheHttpLegacyCurrentApiSignatureTestCases', '--include-filter', 'CtsApacheHttpLegacyUsesLibraryApiSignatureTestCases', '--include-filter', 'CtsAppComponentFactoryTestCases', '--include-filter', 'CtsAppSecurityHostTestCases', '--include-filter', 'CtsAppTestCases', '--include-filter', 'CtsAppUsageHostTestCases', '--include-filter', 'CtsAppWidgetTestCases', '--include-filter', 'CtsAslrMallocTestCases', '--include-filter', 'CtsAssistTestCases', '--include-filter', 'CtsAtraceHostTestCases', '--include-filter', 'CtsAutoFillServiceTestCases', '--include-filter', 'CtsBackgroundRestrictionsTestCases', '--include-filter', 'CtsBackupHostTestCases', '--include-filter', 'CtsBackupTestCases', '--include-filter', 'CtsBatterySavingTestCases', '--include-filter', 'CtsBionicTestCases', '--include-filter', 'CtsBluetoothTestCases', '--include-filter', 'CtsBootStatsTestCases', '--include-filter', 'CtsCalendarcommon2TestCases', '--include-filter', 'CtsCameraApi25TestCases', '--include-filter', 'CtsCameraTestCases', '--include-filter', 'CtsCarTestCases', '--include-filter', 'CtsCarrierApiTestCases', '--include-filter', 'CtsColorModeTestCases', '--include-filter', 'CtsCompilationTestCases', '--include-filter', 'CtsContactsProviderWipe', '--include-filter', 'CtsContentTestCases', '--include-filter', 'CtsCppToolsTestCases', '--include-filter', 'CtsCurrentApiSignatureTestCases', '--include-filter', 'CtsDatabaseTestCases', '--include-filter', 'CtsDebugTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='all.CtsAdminPackageInstallerTestCases_-_CtsDebugTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases
index fcb42d8..a449559 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases
@@ -23,8 +23,8 @@
max_retry=15,
tag='9.0_r10.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDeqpTestCases'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDeqpTestCases', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='all.CtsDeqpTestCases_-_CtsDeqpTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases
index 93ee8c9..2e78231 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases
@@ -23,8 +23,8 @@
max_retry=9,
tag='9.0_r10.x86.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeviceIdleHostTestCases', '--include-filter', 'CtsDevicePolicyManagerTestCases', '--include-filter', 'CtsDexMetadataHostTestCases', '--include-filter', 'CtsDisplayTestCases', '--include-filter', 'CtsDpiTestCases', '--include-filter', 'CtsDpiTestCases2', '--include-filter', 'CtsDreamsTestCases', '--include-filter', 'CtsDrmTestCases', '--include-filter', 'CtsDumpsysHostTestCases', '--include-filter', 'CtsDynamicLinkerTestCases', '--include-filter', 'CtsEdiHostTestCases', '--include-filter', 'CtsEffectTestCases', '--include-filter', 'CtsExternalServiceTestCases', '--include-filter', 'CtsExternalSourcesTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeviceIdleHostTestCases', '--include-filter', 'CtsDevicePolicyManagerTestCases', '--include-filter', 'CtsDexMetadataHostTestCases', '--include-filter', 'CtsDisplayTestCases', '--include-filter', 'CtsDpiTestCases', '--include-filter', 'CtsDpiTestCases2', '--include-filter', 'CtsDreamsTestCases', '--include-filter', 'CtsDrmTestCases', '--include-filter', 'CtsDumpsysHostTestCases', '--include-filter', 'CtsDynamicLinkerTestCases', '--include-filter', 'CtsEdiHostTestCases', '--include-filter', 'CtsEffectTestCases', '--include-filter', 'CtsExternalServiceTestCases', '--include-filter', 'CtsExternalSourcesTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='all.CtsDeviceIdleHostTestCases_-_CtsExternalSourcesTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
index 69a9eb4..0a8fd71 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases
@@ -23,8 +23,8 @@
max_retry=9,
tag='9.0_r10.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.all.CtsFileSystemTestCases_-_CtsFileSystemTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsFileSystemTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsFileSystemTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='all.CtsFileSystemTestCases_-_CtsFileSystemTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases
index bd16c48..fe5bbc6 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases
@@ -23,8 +23,8 @@
max_retry=9,
tag='9.0_r10.x86.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiAttachingHostTestCases', '--include-filter', 'CtsJvmtiAttachingTestCases', '--include-filter', 'CtsJvmtiRedefineClassesHostTestCases', '--include-filter', 'CtsJvmtiRunTest1900HostTestCases', '--include-filter', 'CtsJvmtiRunTest1901HostTestCases', '--include-filter', 'CtsJvmtiRunTest1902HostTestCases', '--include-filter', 'CtsJvmtiRunTest1903HostTestCases', '--include-filter', 'CtsJvmtiRunTest1904HostTestCases', '--include-filter', 'CtsJvmtiRunTest1906HostTestCases', '--include-filter', 'CtsJvmtiRunTest1907HostTestCases', '--include-filter', 'CtsJvmtiRunTest1908HostTestCases', '--include-filter', 'CtsJvmtiRunTest1909HostTestCases', '--include-filter', 'CtsJvmtiRunTest1910HostTestCases', '--include-filter', 'CtsJvmtiRunTest1911HostTestCases', '--include-filter', 'CtsJvmtiRunTest1912HostTestCases', '--include-filter', 'CtsJvmtiRunTest1913HostTestCases', '--include-filter', 'CtsJvmtiRunTest1914HostTestCases', '--include-filter', 'CtsJvmtiRunTest1915HostTestCases', '--include-filter', 'CtsJvmtiRunTest1916HostTestCases', '--include-filter', 'CtsJvmtiRunTest1917HostTestCases', '--include-filter', 'CtsJvmtiRunTest1920HostTestCases', '--include-filter', 'CtsJvmtiRunTest1921HostTestCases', '--include-filter', 'CtsJvmtiRunTest1922HostTestCases', '--include-filter', 'CtsJvmtiRunTest1923HostTestCases', '--include-filter', 'CtsJvmtiRunTest1924HostTestCases', '--include-filter', 'CtsJvmtiRunTest1925HostTestCases', '--include-filter', 'CtsJvmtiRunTest1926HostTestCases', '--include-filter', 'CtsJvmtiRunTest1927HostTestCases', '--include-filter', 'CtsJvmtiRunTest1928HostTestCases', '--include-filter', 'CtsJvmtiRunTest1930HostTestCases', '--include-filter', 'CtsJvmtiRunTest1931HostTestCases', '--include-filter', 'CtsJvmtiRunTest1932HostTestCases', '--include-filter', 'CtsJvmtiRunTest1933HostTestCases', '--include-filter', 'CtsJvmtiRunTest1934HostTestCases', '--include-filter', 'CtsJvmtiRunTest1936HostTestCases', '--include-filter', 'CtsJvmtiRunTest1937HostTestCases', '--include-filter', 'CtsJvmtiRunTest1939HostTestCases', '--include-filter', 'CtsJvmtiRunTest1941HostTestCases', '--include-filter', 'CtsJvmtiRunTest1942HostTestCases', '--include-filter', 'CtsJvmtiRunTest1943HostTestCases', '--include-filter', 'CtsJvmtiRunTest902HostTestCases', '--include-filter', 'CtsJvmtiRunTest903HostTestCases', '--include-filter', 'CtsJvmtiRunTest904HostTestCases', '--include-filter', 'CtsJvmtiRunTest905HostTestCases', '--include-filter', 'CtsJvmtiRunTest906HostTestCases', '--include-filter', 'CtsJvmtiRunTest907HostTestCases', '--include-filter', 'CtsJvmtiRunTest908HostTestCases', '--include-filter', 'CtsJvmtiRunTest910HostTestCases', '--include-filter', 'CtsJvmtiRunTest911HostTestCases', '--include-filter', 'CtsJvmtiRunTest912HostTestCases', '--include-filter', 'CtsJvmtiRunTest913HostTestCases', '--include-filter', 'CtsJvmtiRunTest914HostTestCases', '--include-filter', 'CtsJvmtiRunTest915HostTestCases', '--include-filter', 'CtsJvmtiRunTest917HostTestCases', '--include-filter', 'CtsJvmtiRunTest918HostTestCases', '--include-filter', 'CtsJvmtiRunTest919HostTestCases', '--include-filter', 'CtsJvmtiRunTest920HostTestCases', '--include-filter', 'CtsJvmtiRunTest922HostTestCases', '--include-filter', 'CtsJvmtiRunTest923HostTestCases', '--include-filter', 'CtsJvmtiRunTest924HostTestCases', '--include-filter', 'CtsJvmtiRunTest926HostTestCases', '--include-filter', 'CtsJvmtiRunTest927HostTestCases', '--include-filter', 'CtsJvmtiRunTest928HostTestCases', '--include-filter', 'CtsJvmtiRunTest930HostTestCases', '--include-filter', 'CtsJvmtiRunTest931HostTestCases', '--include-filter', 'CtsJvmtiRunTest932HostTestCases', '--include-filter', 'CtsJvmtiRunTest940HostTestCases', '--include-filter', 'CtsJvmtiRunTest942HostTestCases', '--include-filter', 'CtsJvmtiRunTest944HostTestCases', '--include-filter', 'CtsJvmtiRunTest945HostTestCases', '--include-filter', 'CtsJvmtiRunTest947HostTestCases', '--include-filter', 'CtsJvmtiRunTest951HostTestCases', '--include-filter', 'CtsJvmtiRunTest982HostTestCases', '--include-filter', 'CtsJvmtiRunTest983HostTestCases', '--include-filter', 'CtsJvmtiRunTest984HostTestCases', '--include-filter', 'CtsJvmtiRunTest985HostTestCases', '--include-filter', 'CtsJvmtiRunTest986HostTestCases', '--include-filter', 'CtsJvmtiRunTest988HostTestCases', '--include-filter', 'CtsJvmtiRunTest989HostTestCases', '--include-filter', 'CtsJvmtiRunTest990HostTestCases', '--include-filter', 'CtsJvmtiRunTest991HostTestCases', '--include-filter', 'CtsJvmtiRunTest992HostTestCases', '--include-filter', 'CtsJvmtiRunTest993HostTestCases', '--include-filter', 'CtsJvmtiRunTest994HostTestCases', '--include-filter', 'CtsJvmtiRunTest995HostTestCases', '--include-filter', 'CtsJvmtiRunTest996HostTestCases', '--include-filter', 'CtsJvmtiRunTest997HostTestCases', '--include-filter', 'CtsJvmtiTaggingHostTestCases', '--include-filter', 'CtsJvmtiTrackingHostTestCases', '--include-filter', 'CtsKernelConfigTestCases', '--include-filter', 'CtsKeystoreTestCases', '--include-filter', 'CtsLeanbackJankTestCases', '--include-filter', 'CtsLegacyNotificationTestCases', '--include-filter', 'CtsLibcoreFileIOTestCases', '--include-filter', 'CtsLibcoreJsr166TestCases', '--include-filter', 'CtsLibcoreLegacy22TestCases', '--include-filter', 'CtsLibcoreOjTestCases', '--include-filter', 'CtsLibcoreOkHttpTestCases', '--include-filter', 'CtsLibcoreTestCases', '--include-filter', 'CtsLibcoreWycheproofBCTestCases', '--include-filter', 'CtsLibcoreWycheproofConscryptTestCases', '--include-filter', 'CtsLiblogTestCases', '--include-filter', 'CtsLocation2TestCases', '--include-filter', 'CtsLocationTestCases', '--include-filter', 'CtsLogdTestCases'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiAttachingHostTestCases', '--include-filter', 'CtsJvmtiAttachingTestCases', '--include-filter', 'CtsJvmtiRedefineClassesHostTestCases', '--include-filter', 'CtsJvmtiRunTest1900HostTestCases', '--include-filter', 'CtsJvmtiRunTest1901HostTestCases', '--include-filter', 'CtsJvmtiRunTest1902HostTestCases', '--include-filter', 'CtsJvmtiRunTest1903HostTestCases', '--include-filter', 'CtsJvmtiRunTest1904HostTestCases', '--include-filter', 'CtsJvmtiRunTest1906HostTestCases', '--include-filter', 'CtsJvmtiRunTest1907HostTestCases', '--include-filter', 'CtsJvmtiRunTest1908HostTestCases', '--include-filter', 'CtsJvmtiRunTest1909HostTestCases', '--include-filter', 'CtsJvmtiRunTest1910HostTestCases', '--include-filter', 'CtsJvmtiRunTest1911HostTestCases', '--include-filter', 'CtsJvmtiRunTest1912HostTestCases', '--include-filter', 'CtsJvmtiRunTest1913HostTestCases', '--include-filter', 'CtsJvmtiRunTest1914HostTestCases', '--include-filter', 'CtsJvmtiRunTest1915HostTestCases', '--include-filter', 'CtsJvmtiRunTest1916HostTestCases', '--include-filter', 'CtsJvmtiRunTest1917HostTestCases', '--include-filter', 'CtsJvmtiRunTest1920HostTestCases', '--include-filter', 'CtsJvmtiRunTest1921HostTestCases', '--include-filter', 'CtsJvmtiRunTest1922HostTestCases', '--include-filter', 'CtsJvmtiRunTest1923HostTestCases', '--include-filter', 'CtsJvmtiRunTest1924HostTestCases', '--include-filter', 'CtsJvmtiRunTest1925HostTestCases', '--include-filter', 'CtsJvmtiRunTest1926HostTestCases', '--include-filter', 'CtsJvmtiRunTest1927HostTestCases', '--include-filter', 'CtsJvmtiRunTest1928HostTestCases', '--include-filter', 'CtsJvmtiRunTest1930HostTestCases', '--include-filter', 'CtsJvmtiRunTest1931HostTestCases', '--include-filter', 'CtsJvmtiRunTest1932HostTestCases', '--include-filter', 'CtsJvmtiRunTest1933HostTestCases', '--include-filter', 'CtsJvmtiRunTest1934HostTestCases', '--include-filter', 'CtsJvmtiRunTest1936HostTestCases', '--include-filter', 'CtsJvmtiRunTest1937HostTestCases', '--include-filter', 'CtsJvmtiRunTest1939HostTestCases', '--include-filter', 'CtsJvmtiRunTest1941HostTestCases', '--include-filter', 'CtsJvmtiRunTest1942HostTestCases', '--include-filter', 'CtsJvmtiRunTest1943HostTestCases', '--include-filter', 'CtsJvmtiRunTest902HostTestCases', '--include-filter', 'CtsJvmtiRunTest903HostTestCases', '--include-filter', 'CtsJvmtiRunTest904HostTestCases', '--include-filter', 'CtsJvmtiRunTest905HostTestCases', '--include-filter', 'CtsJvmtiRunTest906HostTestCases', '--include-filter', 'CtsJvmtiRunTest907HostTestCases', '--include-filter', 'CtsJvmtiRunTest908HostTestCases', '--include-filter', 'CtsJvmtiRunTest910HostTestCases', '--include-filter', 'CtsJvmtiRunTest911HostTestCases', '--include-filter', 'CtsJvmtiRunTest912HostTestCases', '--include-filter', 'CtsJvmtiRunTest913HostTestCases', '--include-filter', 'CtsJvmtiRunTest914HostTestCases', '--include-filter', 'CtsJvmtiRunTest915HostTestCases', '--include-filter', 'CtsJvmtiRunTest917HostTestCases', '--include-filter', 'CtsJvmtiRunTest918HostTestCases', '--include-filter', 'CtsJvmtiRunTest919HostTestCases', '--include-filter', 'CtsJvmtiRunTest920HostTestCases', '--include-filter', 'CtsJvmtiRunTest922HostTestCases', '--include-filter', 'CtsJvmtiRunTest923HostTestCases', '--include-filter', 'CtsJvmtiRunTest924HostTestCases', '--include-filter', 'CtsJvmtiRunTest926HostTestCases', '--include-filter', 'CtsJvmtiRunTest927HostTestCases', '--include-filter', 'CtsJvmtiRunTest928HostTestCases', '--include-filter', 'CtsJvmtiRunTest930HostTestCases', '--include-filter', 'CtsJvmtiRunTest931HostTestCases', '--include-filter', 'CtsJvmtiRunTest932HostTestCases', '--include-filter', 'CtsJvmtiRunTest940HostTestCases', '--include-filter', 'CtsJvmtiRunTest942HostTestCases', '--include-filter', 'CtsJvmtiRunTest944HostTestCases', '--include-filter', 'CtsJvmtiRunTest945HostTestCases', '--include-filter', 'CtsJvmtiRunTest947HostTestCases', '--include-filter', 'CtsJvmtiRunTest951HostTestCases', '--include-filter', 'CtsJvmtiRunTest982HostTestCases', '--include-filter', 'CtsJvmtiRunTest983HostTestCases', '--include-filter', 'CtsJvmtiRunTest984HostTestCases', '--include-filter', 'CtsJvmtiRunTest985HostTestCases', '--include-filter', 'CtsJvmtiRunTest986HostTestCases', '--include-filter', 'CtsJvmtiRunTest988HostTestCases', '--include-filter', 'CtsJvmtiRunTest989HostTestCases', '--include-filter', 'CtsJvmtiRunTest990HostTestCases', '--include-filter', 'CtsJvmtiRunTest991HostTestCases', '--include-filter', 'CtsJvmtiRunTest992HostTestCases', '--include-filter', 'CtsJvmtiRunTest993HostTestCases', '--include-filter', 'CtsJvmtiRunTest994HostTestCases', '--include-filter', 'CtsJvmtiRunTest995HostTestCases', '--include-filter', 'CtsJvmtiRunTest996HostTestCases', '--include-filter', 'CtsJvmtiRunTest997HostTestCases', '--include-filter', 'CtsJvmtiTaggingHostTestCases', '--include-filter', 'CtsJvmtiTrackingHostTestCases', '--include-filter', 'CtsKernelConfigTestCases', '--include-filter', 'CtsKeystoreTestCases', '--include-filter', 'CtsLeanbackJankTestCases', '--include-filter', 'CtsLegacyNotificationTestCases', '--include-filter', 'CtsLibcoreFileIOTestCases', '--include-filter', 'CtsLibcoreJsr166TestCases', '--include-filter', 'CtsLibcoreLegacy22TestCases', '--include-filter', 'CtsLibcoreOjTestCases', '--include-filter', 'CtsLibcoreOkHttpTestCases', '--include-filter', 'CtsLibcoreTestCases', '--include-filter', 'CtsLibcoreWycheproofBCTestCases', '--include-filter', 'CtsLibcoreWycheproofConscryptTestCases', '--include-filter', 'CtsLiblogTestCases', '--include-filter', 'CtsLocation2TestCases', '--include-filter', 'CtsLocationTestCases', '--include-filter', 'CtsLogdTestCases', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='all.CtsJvmtiAttachingHostTestCases_-_CtsLogdTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases
index ed2734f..79ebf91 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases
@@ -23,8 +23,8 @@
max_retry=9,
tag='9.0_r10.x86.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.all.CtsMediaHostTestCases_-_CtsMediaHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaHostTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='all.CtsMediaHostTestCases_-_CtsMediaHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases
index 244faa0..64202e9 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases
@@ -23,8 +23,8 @@
max_retry=9,
tag='9.0_r10.x86.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMidiTestCases', '--include-filter', 'CtsMockingDebuggableTestCases', '--include-filter', 'CtsMockingTestCases', '--include-filter', 'CtsMonkeyTestCases', '--include-filter', 'CtsMultiUserHostTestCases', '--include-filter', 'CtsMultiUserTestCases', '--include-filter', 'CtsNNAPITestCases', '--include-filter', 'CtsNativeHardwareTestCases', '--include-filter', 'CtsNativeMediaAAudioTestCases', '--include-filter', 'CtsNativeMediaSlTestCases', '--include-filter', 'CtsNativeMediaXaTestCases', '--include-filter', 'CtsNativeNetTestCases', '--include-filter', 'CtsNdefTestCases', '--include-filter', 'CtsNetSecConfigAttributeTestCases', '--include-filter', 'CtsNetSecConfigBasicDebugDisabledTestCases', '--include-filter', 'CtsNetSecConfigBasicDebugEnabledTestCases', '--include-filter', 'CtsNetSecConfigBasicDomainConfigTestCases', '--include-filter', 'CtsNetSecConfigCleartextTrafficTestCases', '--include-filter', 'CtsNetSecConfigDownloadManagerTestCases', '--include-filter', 'CtsNetSecConfigInvalidPinTestCases', '--include-filter', 'CtsNetSecConfigNestedDomainConfigTestCases', '--include-filter', 'CtsNetSecConfigPrePCleartextTrafficTestCases', '--include-filter', 'CtsNetSecConfigResourcesSrcTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficFalseTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficTrueTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases', '--include-filter', 'CtsNetTestCases', '--include-filter', 'CtsNetTestCasesLegacyApi22', '--include-filter', 'CtsNetTestCasesLegacyPermission22', '--include-filter', 'CtsOmapiTestCases', '--include-filter', 'CtsOpenGLTestCases', '--include-filter', 'CtsOpenGlPerf2TestCases', '--include-filter', 'CtsOpenGlPerfTestCases', '--include-filter', 'CtsOsHostTestCases', '--include-filter', 'CtsOsTestCases', '--include-filter', 'CtsPdfTestCases', '--include-filter', 'CtsPerfettoTestCases', '--include-filter', 'CtsPermission2TestCases', '--include-filter', 'CtsPermissionTestCases', '--include-filter', 'CtsPreference2TestCases', '--include-filter', 'CtsPreferenceTestCases', '--include-filter', 'CtsPrintTestCases', '--include-filter', 'CtsProtoTestCases', '--include-filter', 'CtsProviderTestCases', '--include-filter', 'CtsRenderscriptLegacyTestCases', '--include-filter', 'CtsRenderscriptTestCases', '--include-filter', 'CtsRsBlasTestCases', '--include-filter', 'CtsRsCppTestCases', '--include-filter', 'CtsSampleDeviceTestCases', '--include-filter', 'CtsSampleHostTestCases', '--include-filter', 'CtsSaxTestCases', '--include-filter', 'CtsSeccompHostTestCases', '--include-filter', 'CtsSecureElementAccessControlTestCases1', '--include-filter', 'CtsSecureElementAccessControlTestCases2', '--include-filter', 'CtsSecureElementAccessControlTestCases3', '--include-filter', 'CtsSecurityBulletinHostTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMidiTestCases', '--include-filter', 'CtsMockingDebuggableTestCases', '--include-filter', 'CtsMockingTestCases', '--include-filter', 'CtsMonkeyTestCases', '--include-filter', 'CtsMultiUserHostTestCases', '--include-filter', 'CtsMultiUserTestCases', '--include-filter', 'CtsNNAPITestCases', '--include-filter', 'CtsNativeHardwareTestCases', '--include-filter', 'CtsNativeMediaAAudioTestCases', '--include-filter', 'CtsNativeMediaSlTestCases', '--include-filter', 'CtsNativeMediaXaTestCases', '--include-filter', 'CtsNativeNetTestCases', '--include-filter', 'CtsNdefTestCases', '--include-filter', 'CtsNetSecConfigAttributeTestCases', '--include-filter', 'CtsNetSecConfigBasicDebugDisabledTestCases', '--include-filter', 'CtsNetSecConfigBasicDebugEnabledTestCases', '--include-filter', 'CtsNetSecConfigBasicDomainConfigTestCases', '--include-filter', 'CtsNetSecConfigCleartextTrafficTestCases', '--include-filter', 'CtsNetSecConfigDownloadManagerTestCases', '--include-filter', 'CtsNetSecConfigInvalidPinTestCases', '--include-filter', 'CtsNetSecConfigNestedDomainConfigTestCases', '--include-filter', 'CtsNetSecConfigPrePCleartextTrafficTestCases', '--include-filter', 'CtsNetSecConfigResourcesSrcTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficFalseTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficTrueTestCases', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases', '--include-filter', 'CtsNetTestCases', '--include-filter', 'CtsNetTestCasesLegacyApi22', '--include-filter', 'CtsNetTestCasesLegacyPermission22', '--include-filter', 'CtsOmapiTestCases', '--include-filter', 'CtsOpenGLTestCases', '--include-filter', 'CtsOpenGlPerf2TestCases', '--include-filter', 'CtsOpenGlPerfTestCases', '--include-filter', 'CtsOsHostTestCases', '--include-filter', 'CtsOsTestCases', '--include-filter', 'CtsPdfTestCases', '--include-filter', 'CtsPerfettoTestCases', '--include-filter', 'CtsPermission2TestCases', '--include-filter', 'CtsPermissionTestCases', '--include-filter', 'CtsPreference2TestCases', '--include-filter', 'CtsPreferenceTestCases', '--include-filter', 'CtsPrintTestCases', '--include-filter', 'CtsProtoTestCases', '--include-filter', 'CtsProviderTestCases', '--include-filter', 'CtsRenderscriptLegacyTestCases', '--include-filter', 'CtsRenderscriptTestCases', '--include-filter', 'CtsRsBlasTestCases', '--include-filter', 'CtsRsCppTestCases', '--include-filter', 'CtsSampleDeviceTestCases', '--include-filter', 'CtsSampleHostTestCases', '--include-filter', 'CtsSaxTestCases', '--include-filter', 'CtsSeccompHostTestCases', '--include-filter', 'CtsSecureElementAccessControlTestCases1', '--include-filter', 'CtsSecureElementAccessControlTestCases2', '--include-filter', 'CtsSecureElementAccessControlTestCases3', '--include-filter', 'CtsSecurityBulletinHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='all.CtsMidiTestCases_-_CtsSecurityBulletinHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases
index def2fee..58dd4d3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases
@@ -23,8 +23,8 @@
max_retry=9,
tag='9.0_r10.x86.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSecurityHostTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSecurityHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='all.CtsSecurityHostTestCases_-_CtsSecurityHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases
index 9d5b7d7..c68ece5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases
@@ -23,8 +23,8 @@
max_retry=9,
tag='9.0_r10.x86.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecurityTestCases', '--include-filter', 'CtsSelinuxTargetSdk25TestCases', '--include-filter', 'CtsSelinuxTargetSdk27TestCases', '--include-filter', 'CtsSelinuxTargetSdkCurrentTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecurityTestCases', '--include-filter', 'CtsSelinuxTargetSdk25TestCases', '--include-filter', 'CtsSelinuxTargetSdk27TestCases', '--include-filter', 'CtsSelinuxTargetSdkCurrentTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='all.CtsSecurityTestCases_-_CtsSelinuxTargetSdkCurrentTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsSensorTestCases_-_CtsSensorTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsSensorTestCases_-_CtsSensorTestCases
index 5f0d354..28637da 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsSensorTestCases_-_CtsSensorTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsSensorTestCases_-_CtsSensorTestCases
@@ -23,8 +23,8 @@
max_retry=30,
tag='9.0_r10.x86.all.CtsSensorTestCases_-_CtsSensorTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.all.CtsSensorTestCases_-_CtsSensorTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSensorTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSensorTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='all.CtsSensorTestCases_-_CtsSensorTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsShortcutHostTestCases_-_CtsVideoTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsShortcutHostTestCases_-_CtsVideoTestCases
index a925a0d..3e89046 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsShortcutHostTestCases_-_CtsVideoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsShortcutHostTestCases_-_CtsVideoTestCases
@@ -23,8 +23,8 @@
max_retry=9,
tag='9.0_r10.x86.all.CtsShortcutHostTestCases_-_CtsVideoTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.all.CtsShortcutHostTestCases_-_CtsVideoTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsShortcutHostTestCases', '--include-filter', 'CtsShortcutManagerTestCases', '--include-filter', 'CtsSimRestrictedApisTestCases', '--include-filter', 'CtsSimpleCpuTestCases', '--include-filter', 'CtsSimpleperfTestCases', '--include-filter', 'CtsSkQPTestCases', '--include-filter', 'CtsSliceTestCases', '--include-filter', 'CtsSpeechTestCases', '--include-filter', 'CtsStatsdHostTestCases', '--include-filter', 'CtsSustainedPerformanceHostTestCases', '--include-filter', 'CtsSyncAccountAccessOtherCertTestCases', '--include-filter', 'CtsSyncContentHostTestCases', '--include-filter', 'CtsSyncManagerTestsCases', '--include-filter', 'CtsSystemApiAnnotationTestCases', '--include-filter', 'CtsSystemApiSignatureTestCases', '--include-filter', 'CtsSystemIntentTestCases', '--include-filter', 'CtsSystemUiHostTestCases', '--include-filter', 'CtsSystemUiTestCases', '--include-filter', 'CtsTelecomTestCases', '--include-filter', 'CtsTelecomTestCases2', '--include-filter', 'CtsTelecomTestCases3', '--include-filter', 'CtsTelephony2TestCases', '--include-filter', 'CtsTelephonyTestCases', '--include-filter', 'CtsTextTestCases', '--include-filter', 'CtsThemeDeviceTestCases', '--include-filter', 'CtsThemeHostTestCases', '--include-filter', 'CtsToastLegacyTestCases', '--include-filter', 'CtsToastTestCases', '--include-filter', 'CtsTransitionTestCases', '--include-filter', 'CtsTrustedVoiceHostTestCases', '--include-filter', 'CtsTvProviderTestCases', '--include-filter', 'CtsTvTestCases', '--include-filter', 'CtsUiAutomationTestCases', '--include-filter', 'CtsUiDeviceTestCases', '--include-filter', 'CtsUiRenderingTestCases', '--include-filter', 'CtsUidIsolationTestCases', '--include-filter', 'CtsUsageStatsTestCases', '--include-filter', 'CtsUsbTests', '--include-filter', 'CtsUtilTestCases', '--include-filter', 'CtsVideoTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsShortcutHostTestCases', '--include-filter', 'CtsShortcutManagerTestCases', '--include-filter', 'CtsSimRestrictedApisTestCases', '--include-filter', 'CtsSimpleCpuTestCases', '--include-filter', 'CtsSimpleperfTestCases', '--include-filter', 'CtsSkQPTestCases', '--include-filter', 'CtsSliceTestCases', '--include-filter', 'CtsSpeechTestCases', '--include-filter', 'CtsStatsdHostTestCases', '--include-filter', 'CtsSustainedPerformanceHostTestCases', '--include-filter', 'CtsSyncAccountAccessOtherCertTestCases', '--include-filter', 'CtsSyncContentHostTestCases', '--include-filter', 'CtsSyncManagerTestsCases', '--include-filter', 'CtsSystemApiAnnotationTestCases', '--include-filter', 'CtsSystemApiSignatureTestCases', '--include-filter', 'CtsSystemIntentTestCases', '--include-filter', 'CtsSystemUiHostTestCases', '--include-filter', 'CtsSystemUiTestCases', '--include-filter', 'CtsTelecomTestCases', '--include-filter', 'CtsTelecomTestCases2', '--include-filter', 'CtsTelecomTestCases3', '--include-filter', 'CtsTelephony2TestCases', '--include-filter', 'CtsTelephonyTestCases', '--include-filter', 'CtsTextTestCases', '--include-filter', 'CtsThemeDeviceTestCases', '--include-filter', 'CtsThemeHostTestCases', '--include-filter', 'CtsToastLegacyTestCases', '--include-filter', 'CtsToastTestCases', '--include-filter', 'CtsTransitionTestCases', '--include-filter', 'CtsTrustedVoiceHostTestCases', '--include-filter', 'CtsTvProviderTestCases', '--include-filter', 'CtsTvTestCases', '--include-filter', 'CtsUiAutomationTestCases', '--include-filter', 'CtsUiDeviceTestCases', '--include-filter', 'CtsUiRenderingTestCases', '--include-filter', 'CtsUidIsolationTestCases', '--include-filter', 'CtsUsageStatsTestCases', '--include-filter', 'CtsUsbTests', '--include-filter', 'CtsUtilTestCases', '--include-filter', 'CtsVideoTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='all.CtsShortcutHostTestCases_-_CtsVideoTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsViewTestCases_-_CtsViewTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsViewTestCases_-_CtsViewTestCases
index 47e4a3b..5152d9e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsViewTestCases_-_CtsViewTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsViewTestCases_-_CtsViewTestCases
@@ -23,8 +23,8 @@
max_retry=9,
tag='9.0_r10.x86.all.CtsViewTestCases_-_CtsViewTestCases',
test_name='cheets_CTS_P.9.0_r10.x86.all.CtsViewTestCases_-_CtsViewTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsViewTestCases', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsViewTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='all.CtsViewTestCases_-_CtsViewTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsVmTestCases_-_vm-tests-tf b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsVmTestCases_-_vm-tests-tf
index 3d18b88..20fff4e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsVmTestCases_-_vm-tests-tf
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.all.CtsVmTestCases_-_vm-tests-tf
@@ -23,8 +23,8 @@
max_retry=9,
tag='9.0_r10.x86.all.CtsVmTestCases_-_vm-tests-tf',
test_name='cheets_CTS_P.9.0_r10.x86.all.CtsVmTestCases_-_vm-tests-tf',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsVmTestCases', '--include-filter', 'CtsVoiceInteractionTestCases', '--include-filter', 'CtsVoiceSettingsTestCases', '--include-filter', 'CtsVrTestCases', '--include-filter', 'CtsWebkitTestCases', '--include-filter', 'CtsWidgetTestCases', '--include-filter', 'CtsWindowManagerDeviceTestCases', '--include-filter', 'CtsWrapNoWrapTestCases', '--include-filter', 'CtsWrapWrapDebugMallocDebugTestCases', '--include-filter', 'CtsWrapWrapDebugTestCases', '--include-filter', 'CtsWrapWrapNoDebugTestCases', '--include-filter', 'cts-system-all.api', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases1', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases2', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases3', '--include-filter', 'vm-tests-tf', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsVmTestCases', '--include-filter', 'CtsVoiceInteractionTestCases', '--include-filter', 'CtsVoiceSettingsTestCases', '--include-filter', 'CtsVrTestCases', '--include-filter', 'CtsWebkitTestCases', '--include-filter', 'CtsWidgetTestCases', '--include-filter', 'CtsWindowManagerDeviceTestCases', '--include-filter', 'CtsWrapNoWrapTestCases', '--include-filter', 'CtsWrapWrapDebugMallocDebugTestCases', '--include-filter', 'CtsWrapWrapDebugTestCases', '--include-filter', 'CtsWrapWrapNoDebugTestCases', '--include-filter', 'cts-system-all.api', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases1', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases2', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases3', '--include-filter', 'vm-tests-tf', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='all.CtsVmTestCases_-_vm-tests-tf',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.cts-system-all.api b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.cts-system-all.api
index 964e250..ce56ebb 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.cts-system-all.api
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.cts-system-all.api
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.cts-system-all.api',
test_name='cheets_CTS_P.9.0_r10.x86.cts-system-all.api',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'cts-system-all.api', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'cts-system-all.api', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='cts-system-all.api',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.signed-CtsSecureElementAccessControl b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.signed-CtsSecureElementAccessControl
index c4f7673..86ff660 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.signed-CtsSecureElementAccessControl
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.signed-CtsSecureElementAccessControl
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.signed-CtsSecureElementAccessControl',
test_name='cheets_CTS_P.9.0_r10.x86.signed-CtsSecureElementAccessControl',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases1', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases2', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases3', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases1', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases2', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases3', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='signed-CtsSecureElementAccessControl',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.tradefed-run-collect-tests-only-internal b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.tradefed-run-collect-tests-only-internal
index bdc518a..a309f57 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.tradefed-run-collect-tests-only-internal
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.tradefed-run-collect-tests-only-internal
@@ -23,7 +23,7 @@
max_retry=0,
tag='9.0_r10.x86.tradefed-run-collect-tests-only-internal',
test_name='cheets_CTS_P.9.0_r10.x86.tradefed-run-collect-tests-only-internal',
- run_template=['run', 'commandAndExit', 'collect-tests-only', '--disable-reboot', '--module-arg', 'CtsMediaTestCases:skip-media-download:true', '--module-arg', 'CtsMediaStressTestCases:skip-media-download:true', '--module-arg', 'CtsMediaBitstreamsTestCases:skip-media-download:true'],
+ run_template=['run', 'commandAndExit', 'collect-tests-only', '--disable-reboot', '--module-arg', 'CtsMediaTestCases:skip-media-download:true', '--module-arg', 'CtsMediaStressTestCases:skip-media-download:true', '--module-arg', 'CtsMediaBitstreamsTestCases:skip-media-download:true', '--dynamic-config-url='],
retry_template=None,
target_module=None,
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.vm-tests-tf b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.vm-tests-tf
index 162789f..a65f8e6 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.vm-tests-tf
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.vm-tests-tf
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.vm-tests-tf',
test_name='cheets_CTS_P.9.0_r10.x86.vm-tests-tf',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'vm-tests-tf', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'vm-tests-tf', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='vm-tests-tf',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.wm-presubmit b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.wm-presubmit
index 49e7954..75d9474 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.wm-presubmit
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.wm-presubmit
@@ -22,8 +22,8 @@
iterations=1,
tag='9.0_r10.x86.wm-presubmit',
test_name='cheets_CTS_P.9.0_r10.x86.wm-presubmit',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsActivityManagerDeviceSdk25TestCases', '--include-filter', 'CtsActivityManagerDeviceTestCases', '--include-filter', 'CtsAppTestCases android.app.cts.TaskDescriptionTest', '--include-filter', 'CtsWindowManagerDeviceTestCases', '--test-arg', 'com.android.compatibility.common.tradefed.testtype.JarHostTest:include-annotation:android.platform.test.annotations.Presubmit', '--test-arg', 'com.android.tradefed.testtype.AndroidJUnitTest:include-annotation:android.platform.test.annotations.Presubmit', '--test-arg', 'com.android.tradefed.testtype.HostTest:include-annotation:android.platform.test.annotations.Presubmit', '--test-arg', 'com.android.tradefed.testtype.AndroidJUnitTest:exclude-annotation:androidx.test.filters.FlakyTest', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsActivityManagerDeviceSdk25TestCases', '--include-filter', 'CtsActivityManagerDeviceTestCases', '--include-filter', 'CtsAppTestCases android.app.cts.TaskDescriptionTest', '--include-filter', 'CtsWindowManagerDeviceTestCases', '--test-arg', 'com.android.compatibility.common.tradefed.testtype.JarHostTest:include-annotation:android.platform.test.annotations.Presubmit', '--test-arg', 'com.android.tradefed.testtype.AndroidJUnitTest:include-annotation:android.platform.test.annotations.Presubmit', '--test-arg', 'com.android.tradefed.testtype.HostTest:include-annotation:android.platform.test.annotations.Presubmit', '--test-arg', 'com.android.tradefed.testtype.AndroidJUnitTest:exclude-annotation:androidx.test.filters.FlakyTest', '--logcat-on-failure', '--dynamic-config-url='],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='wm-presubmit',
target_plan=None,
bundle='x86',
