cheets_CTS_P/Instant: Uprev to 9.0r20.
BUG=b:232881624
TEST=cheets_CTS_P.internal.arm.CtsUsbTests
Change-Id: Ia38b8fe6030d59500612e9625a393e3166dcf470
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/3662522
Auto-Submit: Kazuhiro Inaba <kinaba@chromium.org>
Tested-by: Kazuhiro Inaba <kinaba@chromium.org>
Reviewed-by: Rintaro Kuroiwa <rkuroiwa@google.com>
(cherry picked from commit 11c8a4bcc388df427e9f4debd4cd318d09e6dd2d)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/3670775
Commit-Queue: Rintaro Kuroiwa <rkuroiwa@google.com>
(cherry picked from commit e16d6f42614a7d9b5bef0527400c64ad850113b5)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/3685670
Commit-Queue: Kazuhiro Inaba <kinaba@chromium.org>
(cherry picked from commit df8c045da9c6737b0a122224df5982982ca5ddb7)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/3686794
diff --git a/server/site_tests/cheets_CTS_Instant/cheets_CTS_Instant.py b/server/site_tests/cheets_CTS_Instant/cheets_CTS_Instant.py
index 02cce1e..07eea88 100644
--- a/server/site_tests/cheets_CTS_Instant/cheets_CTS_Instant.py
+++ b/server/site_tests/cheets_CTS_Instant/cheets_CTS_Instant.py
@@ -27,13 +27,13 @@
_INTERNAL_CTS = 'gs://chromeos-arc-images/cts/bundle/P/'
_BUNDLE_MAP = {
(None, 'arm'):
- _PUBLIC_CTS + 'android-cts_instant-9.0_r19-linux_x86-arm.zip',
+ _PUBLIC_CTS + 'android-cts_instant-9.0_r20-linux_x86-arm.zip',
(None, 'x86'):
- _PUBLIC_CTS + 'android-cts_instant-9.0_r19-linux_x86-x86.zip',
+ _PUBLIC_CTS + 'android-cts_instant-9.0_r20-linux_x86-x86.zip',
('LATEST', 'arm'):
- _INTERNAL_CTS + 'android-cts_instant-9.0_r19-linux_x86-arm.zip',
+ _INTERNAL_CTS + 'android-cts_instant-9.0_r20-linux_x86-arm.zip',
('LATEST', 'x86'):
- _INTERNAL_CTS + 'android-cts_instant-9.0_r19-linux_x86-x86.zip',
+ _INTERNAL_CTS + 'android-cts_instant-9.0_r20-linux_x86-x86.zip',
# No 'DEV' job for CTS_Instant for now.
}
_CTS_MEDIA_URI = _PUBLIC_CTS + 'android-cts-media-1.5.zip'
diff --git a/server/site_tests/cheets_CTS_Instant/control.9.0_r19.arm.tradefed-run-collect-tests-only-internal b/server/site_tests/cheets_CTS_Instant/control.9.0_r20.arm.tradefed-run-collect-tests-only-internal
similarity index 84%
rename from server/site_tests/cheets_CTS_Instant/control.9.0_r19.arm.tradefed-run-collect-tests-only-internal
rename to server/site_tests/cheets_CTS_Instant/control.9.0_r20.arm.tradefed-run-collect-tests-only-internal
index 7657c28..f217617 100644
--- a/server/site_tests/cheets_CTS_Instant/control.9.0_r19.arm.tradefed-run-collect-tests-only-internal
+++ b/server/site_tests/cheets_CTS_Instant/control.9.0_r20.arm.tradefed-run-collect-tests-only-internal
@@ -5,7 +5,7 @@
# This file has been automatically generated. Do not edit!
AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_Instant.9.0_r19.arm.tradefed-run-collect-tests-only-internal'
+NAME = 'cheets_CTS_Instant.9.0_r20.arm.tradefed-run-collect-tests-only-internal'
ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-qual'
DEPENDENCIES = 'arc, cts_cpu_arm'
JOB_RETRIES = 0
@@ -22,8 +22,8 @@
hosts=host_list,
iterations=1,
max_retry=0,
- tag='9.0_r19.arm.tradefed-run-collect-tests-only-internal',
- test_name='cheets_CTS_Instant.9.0_r19.arm.tradefed-run-collect-tests-only-internal',
+ tag='9.0_r20.arm.tradefed-run-collect-tests-only-internal',
+ test_name='cheets_CTS_Instant.9.0_r20.arm.tradefed-run-collect-tests-only-internal',
run_template=['run', 'commandAndExit', 'collect-tests-only', '--disable-reboot'],
retry_template=None,
target_module=None,
diff --git a/server/site_tests/cheets_CTS_Instant/control.9.0_r19.x86.tradefed-run-collect-tests-only-internal b/server/site_tests/cheets_CTS_Instant/control.9.0_r20.x86.tradefed-run-collect-tests-only-internal
similarity index 84%
rename from server/site_tests/cheets_CTS_Instant/control.9.0_r19.x86.tradefed-run-collect-tests-only-internal
rename to server/site_tests/cheets_CTS_Instant/control.9.0_r20.x86.tradefed-run-collect-tests-only-internal
index 6ff5f78..053217b 100644
--- a/server/site_tests/cheets_CTS_Instant/control.9.0_r19.x86.tradefed-run-collect-tests-only-internal
+++ b/server/site_tests/cheets_CTS_Instant/control.9.0_r20.x86.tradefed-run-collect-tests-only-internal
@@ -5,7 +5,7 @@
# This file has been automatically generated. Do not edit!
AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_Instant.9.0_r19.x86.tradefed-run-collect-tests-only-internal'
+NAME = 'cheets_CTS_Instant.9.0_r20.x86.tradefed-run-collect-tests-only-internal'
ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-qual'
DEPENDENCIES = 'arc, cts_cpu_x86'
JOB_RETRIES = 0
@@ -22,8 +22,8 @@
hosts=host_list,
iterations=1,
max_retry=0,
- tag='9.0_r19.x86.tradefed-run-collect-tests-only-internal',
- test_name='cheets_CTS_Instant.9.0_r19.x86.tradefed-run-collect-tests-only-internal',
+ tag='9.0_r20.x86.tradefed-run-collect-tests-only-internal',
+ test_name='cheets_CTS_Instant.9.0_r20.x86.tradefed-run-collect-tests-only-internal',
run_template=['run', 'commandAndExit', 'collect-tests-only', '--disable-reboot'],
retry_template=None,
target_module=None,
diff --git a/server/site_tests/cheets_CTS_P/cheets_CTS_P.py b/server/site_tests/cheets_CTS_P/cheets_CTS_P.py
index ea41ba1..86c20a6 100644
--- a/server/site_tests/cheets_CTS_P/cheets_CTS_P.py
+++ b/server/site_tests/cheets_CTS_P/cheets_CTS_P.py
@@ -29,7 +29,7 @@
_PUBLIC_CTS = 'https://dl.google.com/dl/android/cts/'
_INTERNAL_CTS = 'gs://chromeos-arc-images/cts/bundle/P/'
_PARTNER_CTS = 'gs://chromeos-partner-gts/P/'
-_OFFICIAL_ZIP_NAME = 'android-cts-9.0_r19-linux_x86-%s.zip'
+_OFFICIAL_ZIP_NAME = 'android-cts-9.0_r20-linux_x86-%s.zip'
_PREVIEW_ZIP_NAME = 'android-cts-8480133-linux_x86-%s.zip'
_BUNDLE_MAP = {
(None, 'arm'): _PUBLIC_CTS + _OFFICIAL_ZIP_NAME % 'arm',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r19.arm.tradefed-run-collect-tests-only-internal b/server/site_tests/cheets_CTS_P/control.9.0_r20.arm.tradefed-run-collect-tests-only-internal
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r19.arm.tradefed-run-collect-tests-only-internal
rename to server/site_tests/cheets_CTS_P/control.9.0_r20.arm.tradefed-run-collect-tests-only-internal
index ce44cd2..4940d30 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r19.arm.tradefed-run-collect-tests-only-internal
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r20.arm.tradefed-run-collect-tests-only-internal
@@ -5,7 +5,7 @@
# This file has been automatically generated. Do not edit!
AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r19.arm.tradefed-run-collect-tests-only-internal'
+NAME = 'cheets_CTS_P.9.0_r20.arm.tradefed-run-collect-tests-only-internal'
ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:arc-cts-qual'
DEPENDENCIES = 'arc'
JOB_RETRIES = 0
@@ -22,8 +22,8 @@
hosts=host_list,
iterations=1,
max_retry=0,
- tag='9.0_r19.arm.tradefed-run-collect-tests-only-internal',
- test_name='cheets_CTS_P.9.0_r19.arm.tradefed-run-collect-tests-only-internal',
+ tag='9.0_r20.arm.tradefed-run-collect-tests-only-internal',
+ test_name='cheets_CTS_P.9.0_r20.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', '--dynamic-config-url='],
retry_template=None,
target_module=None,
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r19.x86.tradefed-run-collect-tests-only-internal b/server/site_tests/cheets_CTS_P/control.9.0_r20.x86.tradefed-run-collect-tests-only-internal
similarity index 86%
rename from server/site_tests/cheets_CTS_P/control.9.0_r19.x86.tradefed-run-collect-tests-only-internal
rename to server/site_tests/cheets_CTS_P/control.9.0_r20.x86.tradefed-run-collect-tests-only-internal
index c4f9565..4774e47 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r19.x86.tradefed-run-collect-tests-only-internal
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r20.x86.tradefed-run-collect-tests-only-internal
@@ -5,7 +5,7 @@
# This file has been automatically generated. Do not edit!
AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_r19.x86.tradefed-run-collect-tests-only-internal'
+NAME = 'cheets_CTS_P.9.0_r20.x86.tradefed-run-collect-tests-only-internal'
ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:arc-cts-qual'
DEPENDENCIES = 'arc, cts_abi_x86'
JOB_RETRIES = 0
@@ -22,8 +22,8 @@
hosts=host_list,
iterations=1,
max_retry=0,
- tag='9.0_r19.x86.tradefed-run-collect-tests-only-internal',
- test_name='cheets_CTS_P.9.0_r19.x86.tradefed-run-collect-tests-only-internal',
+ tag='9.0_r20.x86.tradefed-run-collect-tests-only-internal',
+ test_name='cheets_CTS_P.9.0_r20.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', '--dynamic-config-url='],
retry_template=None,
target_module=None,
