cheets_CTS_P: Update the DEV version test for testBasicDrawFrame.

These will run as a suplemental test aside of normal CTS tests.
The result is used (1) for us to verify the new CTS version
really pass the test, and (2) for being approved the waiver
automatically during APFE submission.

BUG=b:148752967
TEST=cheets_CTS_P.9.0_dev.arm.waivers

Change-Id: Ibd65cfa90cf27680ad93eea1a3f0d3bb37b37556
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2296408
Tested-by: Kazuhiro Inaba <kinaba@chromium.org>
Tested-by: Jiyoun Ha <jiyounha@google.com>
Auto-Submit: Kazuhiro Inaba <kinaba@chromium.org>
Commit-Queue: Kazuhiro Inaba <kinaba@chromium.org>
Commit-Queue: Jiyoun Ha <jiyounha@google.com>
Reviewed-by: Jiyoun Ha <jiyounha@google.com>
(cherry picked from commit bd40711d4fdb7acdcf3335a1430db6f71d62ba86)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2306872
Reviewed-by: 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 651500c..34831bc 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-6600647-linux_x86-arm.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-6667424-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 b99235b..f5f055b 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-6600647-linux_x86-x86.zip',
+        uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-6667424-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 81e5dc5..6ca2be7 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-6600647-linux_x86-arm.zip',
+        uri='gs://chromeos-partner-gts/android-cts-6667424-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 db78ff3..9a441b4 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-6600647-linux_x86-arm.zip',
+        uri='gs://chromeos-partner-gts/android-cts-6667424-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 657e06f..691ed42 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-6600647-linux_x86-x86.zip',
+        uri='gs://chromeos-partner-gts/android-cts-6667424-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 8fce57a..7e6f78a 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-6600647-linux_x86-x86.zip',
+        uri='gs://chromeos-partner-gts/android-cts-6667424-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 a472688..2eedf6a 100644
--- a/server/site_tests/cheets_CTS_P/subplans/waivers.xml
+++ b/server/site_tests/cheets_CTS_P/subplans/waivers.xml
@@ -11,4 +11,5 @@
   <Entry include="CtsDeqpTestCases dEQP-EGL.functional.robustness.reset_context.shaders.out_of_bounds.reset_status.writes.local_array#vertex" />
   <Entry include="CtsKeystoreTestCases android.keystore.cts.CipherTest#testEmptyPlaintextEncryptsAndDecryptsWhenUnlockedRequired" />
   <Entry include="CtsPermission2TestCases android.permission2.cts.PermissionPolicyTest#testPlatformPermissionPolicyUnaltered" />
+  <Entry include="CtsIncidentHostTestCases com.android.server.cts.GraphicsStatsValidationTest#testBasicDrawFrame" />
 </SubPlan>