CameraBox control files should not contain arc-cts-hardware suite
BUG=b:198384191
TEST=generate_controlefiles_CTS_(P|R).py
Change-Id: Iae4421506c472acf29ee8aa00c1bb968a1d1d3ce
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/3153218
Reviewed-by: Kazuhiro Inaba <kinaba@chromium.org>
Reviewed-by: Jaydeep Mehta <jaydeepmehta@google.com>
Tested-by: Kazuhiro Inaba <kinaba@chromium.org>
Tested-by: Jaydeep Mehta <jaydeepmehta@google.com>
diff --git a/server/cros/tradefed/generate_controlfiles_common.py b/server/cros/tradefed/generate_controlfiles_common.py
index 0ec938b..6c4d742 100755
--- a/server/cros/tradefed/generate_controlfiles_common.py
+++ b/server/cros/tradefed/generate_controlfiles_common.py
@@ -343,7 +343,7 @@
if module in CONFIG['HARDWARE_DEPENDENT_MODULES']:
# CTS modules to be run on all unibuild models.
suites.add('suite:arc-cts-unibuild-hw')
- if module in cts_hardware_modules:
+ if module in cts_hardware_modules and camera_facing is None:
suites.add(CONFIG['HARDWARE_SUITE_NAME'])
if abi == 'x86':
# Handle a special builder for running all of CTS in a betty VM.
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCameraTestCases.noled.camerabox.back b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCameraTestCases.noled.camerabox.back
index 362f07e..c508aab 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCameraTestCases.noled.camerabox.back
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCameraTestCases.noled.camerabox.back
@@ -6,7 +6,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_P.9.0_r17.arm.CtsCameraTestCases.noled.camerabox.back'
-ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-camera, suite:arc-cts-hardware, suite:arc-cts-unibuild, suite:arc-cts-unibuild-hw'
+ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-camera, suite:arc-cts-unibuild, suite:arc-cts-unibuild-hw'
DEPENDENCIES = 'arc, camerabox_light:noled, camerabox_facing:back'
JOB_RETRIES = 1
TEST_TYPE = 'server'
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCameraTestCases.noled.camerabox.front b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCameraTestCases.noled.camerabox.front
index 562e11a..1044cfc 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCameraTestCases.noled.camerabox.front
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCameraTestCases.noled.camerabox.front
@@ -6,7 +6,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_P.9.0_r17.arm.CtsCameraTestCases.noled.camerabox.front'
-ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-camera, suite:arc-cts-hardware, suite:arc-cts-unibuild, suite:arc-cts-unibuild-hw'
+ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-camera, suite:arc-cts-unibuild, suite:arc-cts-unibuild-hw'
DEPENDENCIES = 'arc, camerabox_light:noled, camerabox_facing:front'
JOB_RETRIES = 1
TEST_TYPE = 'server'
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCameraTestCases.noled.camerabox.back b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCameraTestCases.noled.camerabox.back
index 6035905..6d4500f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCameraTestCases.noled.camerabox.back
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCameraTestCases.noled.camerabox.back
@@ -6,7 +6,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_P.9.0_r17.x86.CtsCameraTestCases.noled.camerabox.back'
-ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-camera, suite:arc-cts-hardware, suite:arc-cts-unibuild, suite:arc-cts-unibuild-hw'
+ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-camera, suite:arc-cts-unibuild, suite:arc-cts-unibuild-hw'
DEPENDENCIES = 'arc, cts_abi_x86, camerabox_light:noled, camerabox_facing:back'
JOB_RETRIES = 1
TEST_TYPE = 'server'
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCameraTestCases.noled.camerabox.front b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCameraTestCases.noled.camerabox.front
index 13d8bdf..2b99114 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCameraTestCases.noled.camerabox.front
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCameraTestCases.noled.camerabox.front
@@ -6,7 +6,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_P.9.0_r17.x86.CtsCameraTestCases.noled.camerabox.front'
-ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-camera, suite:arc-cts-hardware, suite:arc-cts-unibuild, suite:arc-cts-unibuild-hw'
+ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-camera, suite:arc-cts-unibuild, suite:arc-cts-unibuild-hw'
DEPENDENCIES = 'arc, cts_abi_x86, camerabox_light:noled, camerabox_facing:front'
JOB_RETRIES = 1
TEST_TYPE = 'server'
diff --git a/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsCameraTestCases.noled.camerabox.back b/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsCameraTestCases.noled.camerabox.back
index 7e1a4c5..26cf894 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsCameraTestCases.noled.camerabox.back
+++ b/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsCameraTestCases.noled.camerabox.back
@@ -6,7 +6,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_R.11_r5.arm.CtsCameraTestCases.noled.camerabox.back'
-ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-camera, suite:arc-cts-hardware, suite:arc-cts-r, suite:arc-cts-unibuild, suite:arc-cts-unibuild-hw'
+ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-camera, suite:arc-cts-r, suite:arc-cts-unibuild, suite:arc-cts-unibuild-hw'
DEPENDENCIES = 'arc, camerabox_light:noled, camerabox_facing:back'
JOB_RETRIES = 1
TEST_TYPE = 'server'
diff --git a/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsCameraTestCases.noled.camerabox.front b/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsCameraTestCases.noled.camerabox.front
index b845783..a409089 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsCameraTestCases.noled.camerabox.front
+++ b/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsCameraTestCases.noled.camerabox.front
@@ -6,7 +6,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_R.11_r5.arm.CtsCameraTestCases.noled.camerabox.front'
-ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-camera, suite:arc-cts-hardware, suite:arc-cts-r, suite:arc-cts-unibuild, suite:arc-cts-unibuild-hw'
+ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-camera, suite:arc-cts-r, suite:arc-cts-unibuild, suite:arc-cts-unibuild-hw'
DEPENDENCIES = 'arc, camerabox_light:noled, camerabox_facing:front'
JOB_RETRIES = 1
TEST_TYPE = 'server'
diff --git a/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsCameraTestCases.noled.camerabox.back b/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsCameraTestCases.noled.camerabox.back
index 1d12e87..dd22b76 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsCameraTestCases.noled.camerabox.back
+++ b/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsCameraTestCases.noled.camerabox.back
@@ -6,7 +6,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_R.11_r5.x86.CtsCameraTestCases.noled.camerabox.back'
-ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-camera, suite:arc-cts-hardware, suite:arc-cts-r, suite:arc-cts-unibuild, suite:arc-cts-unibuild-hw'
+ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-camera, suite:arc-cts-r, suite:arc-cts-unibuild, suite:arc-cts-unibuild-hw'
DEPENDENCIES = 'arc, cts_abi_x86, camerabox_light:noled, camerabox_facing:back'
JOB_RETRIES = 1
TEST_TYPE = 'server'
diff --git a/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsCameraTestCases.noled.camerabox.front b/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsCameraTestCases.noled.camerabox.front
index 0f53148..a612954 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsCameraTestCases.noled.camerabox.front
+++ b/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsCameraTestCases.noled.camerabox.front
@@ -6,7 +6,7 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_R.11_r5.x86.CtsCameraTestCases.noled.camerabox.front'
-ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-camera, suite:arc-cts-hardware, suite:arc-cts-r, suite:arc-cts-unibuild, suite:arc-cts-unibuild-hw'
+ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-camera, suite:arc-cts-r, suite:arc-cts-unibuild, suite:arc-cts-unibuild-hw'
DEPENDENCIES = 'arc, cts_abi_x86, camerabox_light:noled, camerabox_facing:front'
JOB_RETRIES = 1
TEST_TYPE = 'server'
