cheets_CTS_P: Update the DEV version runner.
Mainly to run the CipherTest update.
Since this uprev changes the version tag from r12 to r13,
we can clear the old waivers without confusing the Divo
test name accumulation.
BUG=b:156057279
TEST=cheets_CTS_P.9.0_dev.arm.waivers
Change-Id: I6734593cd4a3e7fa37a07839ce96b4e23cb7acf8
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2206631
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/site_tests/cheets_CTS_P/control.9.0_dev.arm.waivers b/server/site_tests/cheets_CTS_P/control.9.0_dev.arm.waivers
index 6330d24..fae43be 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_dev.arm.waivers
+++ b/server/site_tests/cheets_CTS_P/control.9.0_dev.arm.waivers
@@ -29,7 +29,7 @@
target_plan='waivers',
load_waivers=False,
bundle='arm',
- uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-6369187-linux_x86-arm.zip',
+ uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-6506162-linux_x86-arm.zip',
timeout=7200)
parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_dev.x86.waivers b/server/site_tests/cheets_CTS_P/control.9.0_dev.x86.waivers
index 9e2499e..b858c35 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_dev.x86.waivers
+++ b/server/site_tests/cheets_CTS_P/control.9.0_dev.x86.waivers
@@ -29,7 +29,7 @@
target_plan='waivers',
load_waivers=False,
bundle='x86',
- uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-6369187-linux_x86-x86.zip',
+ uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-6506162-linux_x86-x86.zip',
timeout=14400)
parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.arm.waivers b/server/site_tests/cheets_CTS_P/control.arm.waivers
index dea1f24..ba7bfb6 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.waivers
+++ b/server/site_tests/cheets_CTS_P/control.arm.waivers
@@ -30,7 +30,7 @@
bundle='arm',
retry_manual_tests=True,
warn_on_test_retry=False,
- uri='gs://chromeos-partner-gts/android-cts-6369187-linux_x86-arm.zip',
+ uri='gs://chromeos-partner-gts/android-cts-6506162-linux_x86-arm.zip',
timeout=7200)
parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.arm.waivers-collect-tests-only b/server/site_tests/cheets_CTS_P/control.arm.waivers-collect-tests-only
index 078c641..635539c 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.waivers-collect-tests-only
+++ b/server/site_tests/cheets_CTS_P/control.arm.waivers-collect-tests-only
@@ -32,7 +32,7 @@
bundle='arm',
retry_manual_tests=True,
warn_on_test_retry=False,
- uri='gs://chromeos-partner-gts/android-cts-6369187-linux_x86-arm.zip',
+ uri='gs://chromeos-partner-gts/android-cts-6506162-linux_x86-arm.zip',
timeout=360)
parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.x86.waivers b/server/site_tests/cheets_CTS_P/control.x86.waivers
index c1c9169..c036f7b 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.waivers
+++ b/server/site_tests/cheets_CTS_P/control.x86.waivers
@@ -30,7 +30,7 @@
bundle='x86',
retry_manual_tests=True,
warn_on_test_retry=False,
- uri='gs://chromeos-partner-gts/android-cts-6369187-linux_x86-x86.zip',
+ uri='gs://chromeos-partner-gts/android-cts-6506162-linux_x86-x86.zip',
timeout=7200)
parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.x86.waivers-collect-tests-only b/server/site_tests/cheets_CTS_P/control.x86.waivers-collect-tests-only
index 81589dc..6ccae38 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.waivers-collect-tests-only
+++ b/server/site_tests/cheets_CTS_P/control.x86.waivers-collect-tests-only
@@ -32,7 +32,7 @@
bundle='x86',
retry_manual_tests=True,
warn_on_test_retry=False,
- uri='gs://chromeos-partner-gts/android-cts-6369187-linux_x86-x86.zip',
+ uri='gs://chromeos-partner-gts/android-cts-6506162-linux_x86-x86.zip',
timeout=360)
parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/subplans/waivers.xml b/server/site_tests/cheets_CTS_P/subplans/waivers.xml
index c68462f..b5e3f5b 100644
--- a/server/site_tests/cheets_CTS_P/subplans/waivers.xml
+++ b/server/site_tests/cheets_CTS_P/subplans/waivers.xml
@@ -6,18 +6,5 @@
is incremented. Otherwise the computation for the canonical list
of test cases is confused. See b/151779432.
-->
- <Entry include="CtsBionicTestCases pthread_leak#detach" />
- <Entry include="CtsIncidentHostTestCases com.android.server.cts.GraphicsStatsValidationTest#testBasicDrawFrame"/>
- <Entry include="CtsIncidentHostTestCases com.android.server.cts.GraphicsStatsValidationTest#testDaveyDrawFrame"/>
- <Entry include="CtsIncidentHostTestCases com.android.server.cts.GraphicsStatsValidationTest#testJankyDrawFrame"/>
- <Entry include="CtsLibcoreTestCases com.android.org.conscrypt.javax.net.ssl.SSLContextTest#test_SSLContext_defaultConfiguration"/>
- <Entry include="CtsLibcoreTestCases com.android.org.conscrypt.javax.net.ssl.SSLContextTest#test_SSLContext_x509AndPskConfiguration_defaultProviderOnly"/>
- <Entry include="CtsLibcoreTestCases com.android.org.conscrypt.javax.net.ssl.SSLSocketTest#test_SSLSocket_ClientHello_cipherSuites"/>
- <Entry include="CtsLibcoreTestCases org.apache.harmony.tests.javax.net.ssl.SSLSessionTest#test_getCipherSuite"/>
- <Entry include="CtsBatterySavingTestCases android.os.cts.batterysaving.BatterySaverAlarmTest#testAllowWhileIdleThrottled"/>
- <Entry include="CtsViewTestCases android.view.cts.PixelCopyTest#testDialogProducer" />
- <Entry include="CtsViewTestCases android.view.cts.PixelCopyTest#testDialogProducerCopyToRGBA16F" />
- <Entry include="CtsViewTestCases android.view.cts.PixelCopyTest#testWindowProducer" />
- <Entry include="CtsViewTestCases android.view.cts.PixelCopyTest#testWindowProducerCopyToRGBA16F" />
- <Entry include="CtsViewTestCases android.view.cts.ViewTest#testTouchMode" />
+ <Entry include="CtsKeystoreTestCases android.keystore.cts.CipherTest#testEmptyPlaintextEncryptsAndDecryptsWhenUnlockedRequired" />
</SubPlan>
