cheets_VTS_R: Remove collect-tests-only control files.
VTS doesn't support the option, and we won't need it
since the VTS runs are optional and no strict
completeness check is needed.
BUG=b:176311201
TEST=none
Change-Id: If86a7dab4340132bdde15ae6977addcf133a13bd
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2603068
Tested-by: Kazuhiro Inaba <kinaba@chromium.org>
Auto-Submit: Kazuhiro Inaba <kinaba@chromium.org>
Commit-Queue: Jiyoun Ha <jiyounha@chromium.org>
Reviewed-by: Jiyoun Ha <jiyounha@chromium.org>
diff --git a/server/cros/tradefed/generate_controlfiles_VTS_R.py b/server/cros/tradefed/generate_controlfiles_VTS_R.py
index 20567f7..f64e414 100755
--- a/server/cros/tradefed/generate_controlfiles_VTS_R.py
+++ b/server/cros/tradefed/generate_controlfiles_VTS_R.py
@@ -34,6 +34,7 @@
CONFIG['CONTROLFILE_TEST_FUNCTION_NAME'] = 'run_TS'
CONFIG['CONTROLFILE_WRITE_SIMPLE_QUAL_AND_REGRESS'] = False # True
+CONFIG['CONTROLFILE_WRITE_COLLECT'] = False
CONFIG['CONTROLFILE_WRITE_CAMERA'] = False
CONFIG['CONTROLFILE_WRITE_EXTRA'] = False
diff --git a/server/cros/tradefed/generate_controlfiles_common.py b/server/cros/tradefed/generate_controlfiles_common.py
index 3b05ac4..8e6b956 100755
--- a/server/cros/tradefed/generate_controlfiles_common.py
+++ b/server/cros/tradefed/generate_controlfiles_common.py
@@ -1254,8 +1254,9 @@
write_extra_camera_controlfiles(abi, revision, build, uri,
is_public)
- write_collect_controlfiles(modules, abi, revision, build, uri,
- is_public, is_latest)
+ if CONFIG.get('CONTROLFILE_WRITE_COLLECT', True):
+ write_collect_controlfiles(modules, abi, revision, build, uri,
+ is_public, is_latest)
if CONFIG['CONTROLFILE_WRITE_EXTRA']:
write_extra_controlfiles(None, abi, revision, build, uri,
diff --git a/server/site_tests/cheets_VTS_R/control.11_r1.arm.tradefed-run-collect-tests-only-internal b/server/site_tests/cheets_VTS_R/control.11_r1.arm.tradefed-run-collect-tests-only-internal
deleted file mode 100644
index d2fea54..0000000
--- a/server/site_tests/cheets_VTS_R/control.11_r1.arm.tradefed-run-collect-tests-only-internal
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_VTS_R.11_r1.arm.tradefed-run-collect-tests-only-internal'
-ATTRIBUTES = 'suite:arc-cts-r'
-DEPENDENCIES = 'arc, cts_abi_arm'
-JOB_RETRIES = 0
-TEST_TYPE = 'server'
-TIME = 'LENGTHY'
-MAX_RESULT_SIZE_KB = 1024000
-DOC = 'Run all of the Vendor Test Suite (VTS) using arm ABI in the ARC++ container.'
-
-def run_TS(machine):
- host_list = [hosts.create_host(machine)]
- job.run_test(
- 'cheets_VTS_R',
- hosts=host_list,
- iterations=1,
- max_retry=0,
- tag='11_r1.arm.tradefed-run-collect-tests-only-internal',
- test_name='cheets_VTS_R.11_r1.arm.tradefed-run-collect-tests-only-internal',
- run_template=['run', 'commandAndExit', 'collect-tests-only', '--disable-reboot'],
- retry_template=None,
- target_module=None,
- target_plan=None,
- bundle='arm',
- use_jdk9=True,
- timeout=7200)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_VTS_R/control.11_r1.x86.tradefed-run-collect-tests-only-internal b/server/site_tests/cheets_VTS_R/control.11_r1.x86.tradefed-run-collect-tests-only-internal
deleted file mode 100644
index bfdd61f..0000000
--- a/server/site_tests/cheets_VTS_R/control.11_r1.x86.tradefed-run-collect-tests-only-internal
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_VTS_R.11_r1.x86.tradefed-run-collect-tests-only-internal'
-ATTRIBUTES = 'suite:arc-cts-r'
-DEPENDENCIES = 'arc, cts_abi_x86'
-JOB_RETRIES = 0
-TEST_TYPE = 'server'
-TIME = 'LENGTHY'
-MAX_RESULT_SIZE_KB = 1024000
-DOC = 'Run all of the Vendor Test Suite (VTS) using x86 ABI in the ARC++ container.'
-
-def run_TS(machine):
- host_list = [hosts.create_host(machine)]
- job.run_test(
- 'cheets_VTS_R',
- hosts=host_list,
- iterations=1,
- max_retry=0,
- tag='11_r1.x86.tradefed-run-collect-tests-only-internal',
- test_name='cheets_VTS_R.11_r1.x86.tradefed-run-collect-tests-only-internal',
- run_template=['run', 'commandAndExit', 'collect-tests-only', '--disable-reboot'],
- retry_template=None,
- target_module=None,
- target_plan=None,
- bundle='x86',
- use_jdk9=True,
- timeout=7200)
-
-parallel_simple(run_TS, machines)
