[autotest] Uprev CTS Instant version to 9.0_r9
TEST=None
BUG=b:68778082
Change-Id: I4da433e85606393ce715d5732fdd9e5d0bf01676
Reviewed-on: https://chromium-review.googlesource.com/1760544
Tested-by: Keith Haddow <haddowk@chromium.org>
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
Reviewed-by: Kazuhiro Inaba <kinaba@chromium.org>
(cherry picked from commit f44e1ea691b0358bf89e3c85d85eaefbadab102f)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/1789062
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_Instant/cheets_CTS_Instant.py b/server/site_tests/cheets_CTS_Instant/cheets_CTS_Instant.py
index 49ddb29..a9f3f30 100644
--- a/server/site_tests/cheets_CTS_Instant/cheets_CTS_Instant.py
+++ b/server/site_tests/cheets_CTS_Instant/cheets_CTS_Instant.py
@@ -25,8 +25,8 @@
_PUBLIC_CTS = 'https://dl.google.com/dl/android/cts/'
_PARTNER_CTS = 'gs://chromeos-partner-cts/'
_CTS_URI = {
- 'arm': _PUBLIC_CTS + 'android-cts_instant-9.0_r8-linux_x86-arm.zip',
- 'x86': _PUBLIC_CTS + 'android-cts_instant-9.0_r8-linux_x86-x86.zip',
+ 'arm': _PUBLIC_CTS + 'android-cts_instant-9.0_r9-linux_x86-arm.zip',
+ 'x86': _PUBLIC_CTS + 'android-cts_instant-9.0_r9-linux_x86-x86.zip',
'media': _PUBLIC_CTS + 'android-cts-media-1.4.zip',
}
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsAccessibilityServiceTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsAccessibilityServiceTestCases
index a870562..e241617 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsAccessibilityServiceTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsAccessibilityServiceTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.arm.CtsAccessibilityServiceTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_arm'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsAccessibilityTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsAccessibilityTestCases
index dbf0da3..de6e2d0 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsAccessibilityTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsAccessibilityTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.arm.CtsAccessibilityTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_arm'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsAccountManagerTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsAccountManagerTestCases
index 5690904..1a41edf 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsAccountManagerTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsAccountManagerTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.arm.CtsAccountManagerTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_arm'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsAnimationTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsAnimationTestCases
index 375a326..bd75605 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsAnimationTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsAnimationTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.arm.CtsAnimationTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_arm'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsAppSecurityHostTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsAppSecurityHostTestCases
index 9e23bd6..b43fe17 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsAppSecurityHostTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsAppSecurityHostTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.arm.CtsAppSecurityHostTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_arm'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsAppWidgetTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsAppWidgetTestCases
index 59a3272..cbb9d04 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsAppWidgetTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsAppWidgetTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.arm.CtsAppWidgetTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_arm'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsAutoFillServiceTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsAutoFillServiceTestCases
index d3cf426..d04ae10 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsAutoFillServiceTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsAutoFillServiceTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.arm.CtsAutoFillServiceTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_arm'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsBackgroundRestrictionsTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsBackgroundRestrictionsTestCases
index e0d5c8b..4e6dd71 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsBackgroundRestrictionsTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsBackgroundRestrictionsTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.arm.CtsBackgroundRestrictionsTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_arm'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsCameraTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsCameraTestCases
index 5662c47..725ca36 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsCameraTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsCameraTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.arm.CtsCameraTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc, lighting'
+DEPENDENCIES = 'arc, cts_cpu_arm, lighting'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'LONG'
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsColorModeTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsColorModeTestCases
index d6f474c..251b32f 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsColorModeTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsColorModeTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.arm.CtsColorModeTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_arm'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsDatabaseTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsDatabaseTestCases
index 2070dd0..e62106d 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsDatabaseTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsDatabaseTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.arm.CtsDatabaseTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_arm'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsDisplayTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsDisplayTestCases
index b672e19..1a496b2 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsDisplayTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsDisplayTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.arm.CtsDisplayTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_arm'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsDpiTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsDpiTestCases
index df05863..76bc2b7 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsDpiTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsDpiTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.arm.CtsDpiTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_arm'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsDreamsTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsDreamsTestCases
index a24c7af..b4ecd87 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsDreamsTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsDreamsTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.arm.CtsDreamsTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_arm'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsEdiHostTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsEdiHostTestCases
index 0aa6a53..4c6b27a 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsEdiHostTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsEdiHostTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.arm.CtsEdiHostTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_arm'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsExternalSourcesTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsExternalSourcesTestCases
index 5e045da..bd856aa 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsExternalSourcesTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsExternalSourcesTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.arm.CtsExternalSourcesTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_arm'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsFileSystemTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsFileSystemTestCases
index cffd8bc..15dc7f5 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsFileSystemTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsFileSystemTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.arm.CtsFileSystemTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_arm'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsFragmentTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsFragmentTestCases
index 0954a4a..efab254 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsFragmentTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsFragmentTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.arm.CtsFragmentTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_arm'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsFragmentTestCasesSdk26 b/server/site_tests/cheets_CTS_Instant/control.arm.CtsFragmentTestCasesSdk26
index 67b70c3..794a7ee 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsFragmentTestCasesSdk26
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsFragmentTestCasesSdk26
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.arm.CtsFragmentTestCasesSdk26'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_arm'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsGestureTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsGestureTestCases
index ec74ca3..c5a4321 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsGestureTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsGestureTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.arm.CtsGestureTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_arm'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsHostsideWebViewTests b/server/site_tests/cheets_CTS_Instant/control.arm.CtsHostsideWebViewTests
index 1a64c26..e5355ab 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsHostsideWebViewTests
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsHostsideWebViewTests
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.arm.CtsHostsideWebViewTests'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_arm'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsInputMethodServiceHostTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsInputMethodServiceHostTestCases
index dcad608..4165be1 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsInputMethodServiceHostTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsInputMethodServiceHostTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.arm.CtsInputMethodServiceHostTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_arm'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsInputMethodTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsInputMethodTestCases
index 4dad317..f83e9bf 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsInputMethodTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsInputMethodTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.arm.CtsInputMethodTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_arm'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsLocation2TestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsLocation2TestCases
index 33958e0..cf48dfc 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsLocation2TestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsLocation2TestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.arm.CtsLocation2TestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_arm'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsLocationTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsLocationTestCases
index d211911..e639336 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsLocationTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsLocationTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.arm.CtsLocationTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_arm'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsMediaHostTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsMediaHostTestCases
index 2c93421..300c3ba 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsMediaHostTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsMediaHostTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.arm.CtsMediaHostTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_arm'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsMediaTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsMediaTestCases
index c4c80c9..5c4f433 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsMediaTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsMediaTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.arm.CtsMediaTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc, noloopback'
+DEPENDENCIES = 'arc, cts_cpu_arm, noloopback'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'LONG'
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsMultiUserTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsMultiUserTestCases
index 3121cdc..647288c 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsMultiUserTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsMultiUserTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.arm.CtsMultiUserTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_arm'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsOsHostTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsOsHostTestCases
index da87085..dba8207 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsOsHostTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsOsHostTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.arm.CtsOsHostTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_arm'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsPdfTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsPdfTestCases
index 2720ad5..a87b3c3 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsPdfTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsPdfTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.arm.CtsPdfTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_arm'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsPermission2TestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsPermission2TestCases
index e202cc3..6f0bed0 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsPermission2TestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsPermission2TestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.arm.CtsPermission2TestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_arm'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsPermissionTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsPermissionTestCases
index 9e71d68..0ea2cb5 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsPermissionTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsPermissionTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.arm.CtsPermissionTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_arm'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsPreference2TestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsPreference2TestCases
index 40544e0..26553bc 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsPreference2TestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsPreference2TestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.arm.CtsPreference2TestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_arm'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsPreferenceTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsPreferenceTestCases
index 190fdef..24eb270 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsPreferenceTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsPreferenceTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.arm.CtsPreferenceTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_arm'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsPrintTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsPrintTestCases
index af7f6ce..2da091b 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsPrintTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsPrintTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.arm.CtsPrintTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_arm'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsSampleDeviceTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsSampleDeviceTestCases
index 6be6ea5..fcec280 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsSampleDeviceTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsSampleDeviceTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.arm.CtsSampleDeviceTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_arm'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsSampleHostTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsSampleHostTestCases
index 0a3b0e2..192c5d8 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsSampleHostTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsSampleHostTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.arm.CtsSampleHostTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_arm'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsSystemUiTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsSystemUiTestCases
index 7c90fdf..ebe123f 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsSystemUiTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsSystemUiTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.arm.CtsSystemUiTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_arm'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsTextTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsTextTestCases
index 13a7bdc..f13cad7 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsTextTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsTextTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.arm.CtsTextTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_arm'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsToastTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsToastTestCases
index 713a090..40db8e9 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsToastTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsToastTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.arm.CtsToastTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_arm'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsUiAutomationTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsUiAutomationTestCases
index cbd37bc..9156a19 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsUiAutomationTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsUiAutomationTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.arm.CtsUiAutomationTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_arm'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsUiDeviceTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsUiDeviceTestCases
index 888c34e..c6c8a9c 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsUiDeviceTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsUiDeviceTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.arm.CtsUiDeviceTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_arm'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsUidIsolationTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsUidIsolationTestCases
index 751f458..525934b 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsUidIsolationTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsUidIsolationTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.arm.CtsUidIsolationTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_arm'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsUsageStatsTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsUsageStatsTestCases
index e9066fd..ed3cc3c 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsUsageStatsTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsUsageStatsTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.arm.CtsUsageStatsTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_arm'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsUsbTests b/server/site_tests/cheets_CTS_Instant/control.arm.CtsUsbTests
index aef790b..601d9af 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsUsbTests
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsUsbTests
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.arm.CtsUsbTests'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_arm'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsViewTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsViewTestCases
index 578c551..82aa1d5 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsViewTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsViewTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.arm.CtsViewTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_arm'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsWidgetTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsWidgetTestCases
index aee0feb..e37f58a 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsWidgetTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsWidgetTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.arm.CtsWidgetTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_arm'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsWindowManagerDeviceTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsWindowManagerDeviceTestCases
index 6a15c3d..8228477 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsWindowManagerDeviceTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsWindowManagerDeviceTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.arm.CtsWindowManagerDeviceTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_arm'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.tradefed-run-collect-tests-only b/server/site_tests/cheets_CTS_Instant/control.arm.tradefed-run-collect-tests-only
index 3b4ef77..1263d3a 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.tradefed-run-collect-tests-only
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.tradefed-run-collect-tests-only
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.arm.tradefed-run-collect-tests-only'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_arm'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsAccessibilityServiceTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsAccessibilityServiceTestCases
index 7d1e0a6..3b27c53 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsAccessibilityServiceTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsAccessibilityServiceTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.x86.CtsAccessibilityServiceTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_x86'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsAccessibilityTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsAccessibilityTestCases
index a551cd8..d74874c 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsAccessibilityTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsAccessibilityTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.x86.CtsAccessibilityTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_x86'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsAccountManagerTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsAccountManagerTestCases
index 1233e43..5472b71 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsAccountManagerTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsAccountManagerTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.x86.CtsAccountManagerTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_x86'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsAnimationTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsAnimationTestCases
index e16a08f..a015b3e 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsAnimationTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsAnimationTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.x86.CtsAnimationTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_x86'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsAppSecurityHostTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsAppSecurityHostTestCases
index 310f41b..39e74d3 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsAppSecurityHostTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsAppSecurityHostTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.x86.CtsAppSecurityHostTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_x86'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsAppWidgetTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsAppWidgetTestCases
index 0f5c7d5..df0972a 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsAppWidgetTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsAppWidgetTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.x86.CtsAppWidgetTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_x86'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsAutoFillServiceTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsAutoFillServiceTestCases
index 335e452..8cd1159 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsAutoFillServiceTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsAutoFillServiceTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.x86.CtsAutoFillServiceTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_x86'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsBackgroundRestrictionsTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsBackgroundRestrictionsTestCases
index 63e5a56..c89cf3f 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsBackgroundRestrictionsTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsBackgroundRestrictionsTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.x86.CtsBackgroundRestrictionsTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_x86'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsCameraTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsCameraTestCases
index 7a4ef48..154f57a 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsCameraTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsCameraTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.x86.CtsCameraTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc, lighting'
+DEPENDENCIES = 'arc, cts_cpu_x86, lighting'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'LONG'
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsColorModeTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsColorModeTestCases
index 9cc78ea..f6ed2e2 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsColorModeTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsColorModeTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.x86.CtsColorModeTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_x86'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsDatabaseTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsDatabaseTestCases
index 2ec520d..5517c87 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsDatabaseTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsDatabaseTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.x86.CtsDatabaseTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_x86'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsDisplayTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsDisplayTestCases
index a94d320..4033ba9 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsDisplayTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsDisplayTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.x86.CtsDisplayTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_x86'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsDpiTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsDpiTestCases
index 10e75b2..b324774 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsDpiTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsDpiTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.x86.CtsDpiTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_x86'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsDreamsTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsDreamsTestCases
index 6812efc..2657199 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsDreamsTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsDreamsTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.x86.CtsDreamsTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_x86'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsEdiHostTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsEdiHostTestCases
index ccddc59..bedb4b0 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsEdiHostTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsEdiHostTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.x86.CtsEdiHostTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_x86'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsExternalSourcesTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsExternalSourcesTestCases
index 4de5679..c274d68 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsExternalSourcesTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsExternalSourcesTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.x86.CtsExternalSourcesTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_x86'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsFileSystemTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsFileSystemTestCases
index 9c6b31c..476f76d 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsFileSystemTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsFileSystemTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.x86.CtsFileSystemTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_x86'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsFragmentTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsFragmentTestCases
index 84aae52..93505ec 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsFragmentTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsFragmentTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.x86.CtsFragmentTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_x86'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsFragmentTestCasesSdk26 b/server/site_tests/cheets_CTS_Instant/control.x86.CtsFragmentTestCasesSdk26
index 1ec1f7c..b0f22da 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsFragmentTestCasesSdk26
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsFragmentTestCasesSdk26
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.x86.CtsFragmentTestCasesSdk26'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_x86'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsGestureTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsGestureTestCases
index 3f78789..d9315d4 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsGestureTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsGestureTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.x86.CtsGestureTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_x86'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsHostsideWebViewTests b/server/site_tests/cheets_CTS_Instant/control.x86.CtsHostsideWebViewTests
index 7d0ebe9..41eb80e 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsHostsideWebViewTests
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsHostsideWebViewTests
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.x86.CtsHostsideWebViewTests'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_x86'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsInputMethodServiceHostTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsInputMethodServiceHostTestCases
index 790b491..5cd3563 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsInputMethodServiceHostTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsInputMethodServiceHostTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.x86.CtsInputMethodServiceHostTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_x86'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsInputMethodTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsInputMethodTestCases
index 12dc792..f691e71 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsInputMethodTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsInputMethodTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.x86.CtsInputMethodTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_x86'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsLocation2TestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsLocation2TestCases
index d2636ab..c08fa4c 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsLocation2TestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsLocation2TestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.x86.CtsLocation2TestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_x86'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsLocationTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsLocationTestCases
index 8e6d913..a7a0fb0 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsLocationTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsLocationTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.x86.CtsLocationTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_x86'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsMediaHostTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsMediaHostTestCases
index f8e5a8d..5b3ee6a 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsMediaHostTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsMediaHostTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.x86.CtsMediaHostTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_x86'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsMediaTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsMediaTestCases
index e48353e..682d215 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsMediaTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsMediaTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.x86.CtsMediaTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc, noloopback'
+DEPENDENCIES = 'arc, cts_cpu_x86, noloopback'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'LONG'
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsMultiUserTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsMultiUserTestCases
index e938c74..a6150db 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsMultiUserTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsMultiUserTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.x86.CtsMultiUserTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_x86'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsOsHostTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsOsHostTestCases
index be90dfe..6e106a8 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsOsHostTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsOsHostTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.x86.CtsOsHostTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_x86'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsPdfTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsPdfTestCases
index 4a5682b..6055720 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsPdfTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsPdfTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.x86.CtsPdfTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_x86'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsPermission2TestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsPermission2TestCases
index 5144a13..56736bf 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsPermission2TestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsPermission2TestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.x86.CtsPermission2TestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_x86'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsPermissionTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsPermissionTestCases
index c2415a0..c937eb3 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsPermissionTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsPermissionTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.x86.CtsPermissionTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_x86'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsPreference2TestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsPreference2TestCases
index d09954c..068983d 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsPreference2TestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsPreference2TestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.x86.CtsPreference2TestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_x86'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsPreferenceTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsPreferenceTestCases
index 3934841..6257f43 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsPreferenceTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsPreferenceTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.x86.CtsPreferenceTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_x86'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsPrintTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsPrintTestCases
index ba85dc1..1690eee 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsPrintTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsPrintTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.x86.CtsPrintTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_x86'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsSampleDeviceTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsSampleDeviceTestCases
index dff3410..eae9750 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsSampleDeviceTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsSampleDeviceTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.x86.CtsSampleDeviceTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_x86'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsSampleHostTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsSampleHostTestCases
index 22b537e..20139ff 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsSampleHostTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsSampleHostTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.x86.CtsSampleHostTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_x86'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsSystemUiTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsSystemUiTestCases
index 79b349f..1c99834 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsSystemUiTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsSystemUiTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.x86.CtsSystemUiTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_x86'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsTextTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsTextTestCases
index 2a37018..d60276c 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsTextTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsTextTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.x86.CtsTextTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_x86'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsToastTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsToastTestCases
index b3dd5cd..757ab23 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsToastTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsToastTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.x86.CtsToastTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_x86'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsUiAutomationTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsUiAutomationTestCases
index 14e74cb..926b9e9 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsUiAutomationTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsUiAutomationTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.x86.CtsUiAutomationTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_x86'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsUiDeviceTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsUiDeviceTestCases
index 7717131..04a14f5 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsUiDeviceTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsUiDeviceTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.x86.CtsUiDeviceTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_x86'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsUidIsolationTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsUidIsolationTestCases
index 4a18779..d3bcc3b 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsUidIsolationTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsUidIsolationTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.x86.CtsUidIsolationTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_x86'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsUsageStatsTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsUsageStatsTestCases
index c517bf9..eb086d8 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsUsageStatsTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsUsageStatsTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.x86.CtsUsageStatsTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_x86'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsUsbTests b/server/site_tests/cheets_CTS_Instant/control.x86.CtsUsbTests
index f852e5c..6ceba43 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsUsbTests
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsUsbTests
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.x86.CtsUsbTests'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_x86'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsViewTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsViewTestCases
index 489ac66..43eda29 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsViewTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsViewTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.x86.CtsViewTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_x86'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsWidgetTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsWidgetTestCases
index eb4e132..aebd64e 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsWidgetTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsWidgetTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.x86.CtsWidgetTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_x86'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsWindowManagerDeviceTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsWindowManagerDeviceTestCases
index a2daae7..20f00a3 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsWindowManagerDeviceTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsWindowManagerDeviceTestCases
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.x86.CtsWindowManagerDeviceTestCases'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_x86'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.tradefed-run-collect-tests-only b/server/site_tests/cheets_CTS_Instant/control.x86.tradefed-run-collect-tests-only
index 9efd2f3..edbbe24 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.tradefed-run-collect-tests-only
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.tradefed-run-collect-tests-only
@@ -7,7 +7,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_Instant.x86.tradefed-run-collect-tests-only'
ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
+DEPENDENCIES = 'arc, cts_cpu_x86'
JOB_RETRIES = 1
TEST_TYPE = 'server'
TIME = 'MEDIUM'
