cheets_CTS_P: Move back to CQ/PFQ.
The flaky timeout has resolved in b/149889853.
Let's move back one test to CQ.
* In this CL, I didn't add GTS. The codebase is almost fully shared,
so the CTS sanity run should cover GTS as well.
* JOB_RETRIES is increased to 2 to satisfy the presubmit check.
BUG=b:149889853
TEST=cq
Change-Id: I0e072bfcb87e0d344d47fdbec7fda88f3a01c4c9
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2071460
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/cros/tradefed/generate_controlfiles_GTS.py b/server/cros/tradefed/generate_controlfiles_GTS.py
index a8fbf7f..eafca5f 100755
--- a/server/cros/tradefed/generate_controlfiles_GTS.py
+++ b/server/cros/tradefed/generate_controlfiles_GTS.py
@@ -73,9 +73,7 @@
CONFIG['SMOKE'] = []
-CONFIG['BVT_ARC'] = [
- 'GtsContactsTest',
-]
+CONFIG['BVT_ARC'] = []
CONFIG['BVT_PERBUILD'] = [
'GtsAdminTestCases',
diff --git a/server/cros/tradefed/generate_controlfiles_common.py b/server/cros/tradefed/generate_controlfiles_common.py
index da27d58..5f1299c 100755
--- a/server/cros/tradefed/generate_controlfiles_common.py
+++ b/server/cros/tradefed/generate_controlfiles_common.py
@@ -349,16 +349,21 @@
return ', '.join(dependencies)
-def get_job_retries(modules, is_public):
+def get_job_retries(modules, is_public, suites):
"""Define the number of job retries associated with a module.
@param module: CTS module which will be tested in the control file. If a
special module is specified, the control file will runs all
the tests without retry.
+ @param is_public: true if the control file is for moblab (public) use.
+ @param suites: the list of suites that the control file belongs to.
"""
# TODO(haddowk): remove this when cts p has stabalized.
if is_public:
return CONFIG['CTS_JOB_RETRIES_IN_PUBLIC']
+ # Presubmit check forces to set 2 or more retries for CQ tests.
+ if 'suite:bvt-arc' in suites:
+ return 2
retries = 1 # 0 is NO job retries, 1 is one retry etc.
for module in modules:
# We don't want job retries for module collection or special cases.
@@ -750,7 +755,7 @@
is_camerabox_test=(camera_facing is not None)),
extra_artifacts=get_extra_artifacts(modules),
extra_artifacts_host=get_extra_artifacts_host(modules),
- job_retries=get_job_retries(modules, is_public),
+ job_retries=get_job_retries(modules, is_public, suites),
max_result_size_kb=get_max_result_size_kb(modules, is_public),
revision=revision,
build=build,
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAccelerationTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAccelerationTestCases
index 8ddd555..34aa78c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAccelerationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r11.arm.CtsAccelerationTestCases
@@ -6,9 +6,9 @@
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_P.9.0_r11.arm.CtsAccelerationTestCases'
-ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild'
+ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:bvt-arc'
DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
+JOB_RETRIES = 2
TEST_TYPE = 'server'
TIME = 'MEDIUM'
MAX_RESULT_SIZE_KB = 512000
