tauto - remove test_suites
BUG=None
TEST=unittest suite & dummy_Pass
Change-Id: I889bd6924c3107e1a6e944b9cc0325da5a50d8b6
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/tauto/+/3119682
Tested-by: Derek Beckett <dbeckett@chromium.org>
Reviewed-by: Ruben Zakarian <rzakarian@chromium.org>
diff --git a/test_suites/control.AFDO_record b/test_suites/control.AFDO_record
deleted file mode 100644
index 394c7ac..0000000
--- a/test_suites/control.AFDO_record
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright (c) 2013 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "AFDO_record"
-PURPOSE = "Exercise Chrome, record profiling data using AFDO."
-
-TIME = "LONG"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-Exercise Chrome, record profiling data using AFDO.
-
-The profile is collected using branch and program counter sampling with
-the 'perf' tool instead of creating an instrumented binary as it is done
-with traditional PGO.
-
-The image should have been built with default optimization turned on for chrome.
-We do this to make branch prediction etc. data driven in future optimizations
-of chrome builds, so realism and source control are important.
-
-Mostly we are just wrapping the labelled tests here.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
- 'labels': ['Build-Toolchain'],
- 'owner': 'llozano@chromium.org',
- 'status': None,
- 'summary': None,
- 'title': None,
- 'cc': ['tcwang@chromium.org',
- 'chromeos-toolchain-oncall1@google.com']
-}
-
-args_dict['job'] = job
-args_dict['file_bugs'] = True
-args_dict['name'] = 'AFDO_record'
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.appcompat b/test_suites/control.appcompat
deleted file mode 100644
index 5a119db..0000000
--- a/test_suites/control.appcompat
+++ /dev/null
@@ -1,25 +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.
-
-AUTHOR = "Chromium OS team"
-NAME = "appcompat"
-PURPOSE = "Suite for automated app compat tests."
-TIME = "MEDIUM"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite runs the app compat tests on various devices in the lab.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['add_experimental'] = True
-args_dict['max_runtime_mins'] = 270
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.appcompat_release b/test_suites/control.appcompat_release
deleted file mode 100644
index 377111c..0000000
--- a/test_suites/control.appcompat_release
+++ /dev/null
@@ -1,25 +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.
-
-AUTHOR = "Chromium OS team"
-NAME = "appcompat_release"
-PURPOSE = "Suite for app compat release testing."
-TIME = "MEDIUM"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite runs a few app compat tests on various devices in the lab.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['add_experimental'] = True
-args_dict['max_runtime_mins'] = 120
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.appcompat_smoke b/test_suites/control.appcompat_smoke
deleted file mode 100644
index f2d2831..0000000
--- a/test_suites/control.appcompat_smoke
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chromium OS team"
-NAME = "appcompat_smoke"
-PURPOSE = "Suite for app compat smoke testing."
-TIME = "SHORT"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite runs a few app compat tests on various devices in the lab.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['add_experimental'] = True
-args_dict['max_runtime_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.arcless_smoke b/test_suites/control.arcless_smoke
deleted file mode 100644
index 870bbc9..0000000
--- a/test_suites/control.arcless_smoke
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright (c) 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "arcless_smoke"
-PURPOSE = "Basic non-ARC tests that are able to run in VMs"
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-The ARCless smoke suite is a subset of tests specifically chosen to run
-in virtual machines, but without ARC specific tests.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = 'arcless_smoke'
-args_dict['add_experimental'] = True
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.au-m2n b/test_suites/control.au-m2n
deleted file mode 100644
index d5d8d75..0000000
--- a/test_suites/control.au-m2n
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "David Haddock <dhaddock@chromium.org>"
-NAME = "au-m2n"
-PURPOSE = "Suite for M->N autoupdate tests."
-TIME = "SHORT"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite runs various autoupdate tests M to N. This means the tests will
-update from a previous milestone to the current milestone.
-
-Most autoupdate tests go N->N and update from a version to itself. This M->N
-suite should catch regressions that are missed by N->N tests.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['add_experimental'] = True
-args_dict['max_runtime_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.au-oobe b/test_suites/control.au-oobe
deleted file mode 100644
index 15d0480..0000000
--- a/test_suites/control.au-oobe
+++ /dev/null
@@ -1,28 +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.
-
-AUTHOR = "Kyle Shimabukuro <kyleshima@chromium.org>"
-NAME = "au-oobe"
-PURPOSE = "Suite for out-of-box-experience autoupdate tests."
-TIME = "SHORT"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite runs the out-of-box-experience autoupdate tests. Includes full
-and delta forced auto updates from FSI builds, non-blocking auto updates
-from FSI builds, and cases which ensure the forced auto update is not skipped
-in the event of interruptions (network interruptions, reboot, suspend).
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['add_experimental'] = True
-args_dict['max_runtime_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.au-perbuild b/test_suites/control.au-perbuild
deleted file mode 100644
index 9bcaa75..0000000
--- a/test_suites/control.au-perbuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2019 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.
-
-AUTHOR = "David Haddock <dhaddock@chromium.org>"
-NAME = "au-perbuild"
-PURPOSE = "Suite for autoupdate N-to-N tests."
-TIME = "SHORT"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite runs the N-to-N autoupdate tests.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['add_experimental'] = True
-args_dict['max_runtime_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.au_fsi b/test_suites/control.au_fsi
deleted file mode 100644
index 6e54963..0000000
--- a/test_suites/control.au_fsi
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2019 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.
-
-AUTHOR = "David Haddock <dhaddock@chromium.org>"
-NAME = "au_fsi"
-PURPOSE = "Suite for running OOBE autoupdate tests."
-TIME = "SHORT"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite runs the N-to-N OOBE autoupdate tests.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['add_experimental'] = True
-args_dict['max_runtime_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.audio b/test_suites/control.audio
deleted file mode 100644
index db77848..0000000
--- a/test_suites/control.audio
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright (c) 2012 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.
-
-AUTHOR = "Rohit Makasana <rohitbm@chromium.org>/chromeos-test@google.com"
-NAME = "audio"
-PURPOSE = "Test basic, required functionality."
-
-TIME = "MEDIUM"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-Browser Audio integration tests.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = 'audio'
-args_dict['add_experimental'] = True
-args_dict['max_runtime_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.audio_advanced b/test_suites/control.audio_advanced
deleted file mode 100644
index ed1b8d8..0000000
--- a/test_suites/control.audio_advanced
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright (c) 2019 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.
-
-AUTHOR = "The Chromium OS Authors,chromeos-audio-sw@google.com"
-NAME = "audio_advanced"
-PURPOSE = "Suite for testing advanced audio functionalities."
-
-TIME = "LONG"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-Audio tests that cover advanced audio functionalities that are based on some
-basic ones or the basic ones under different scenarios like after suspend or
-reboot.
-
-The tests require chameleon and audio boards connected. For stability, all
-cables should be plugged constantly without the jack plugger involved.
-
-USB audio shouldn't be configured with other audio devices like 3.5mm headset
-as there is a known issue that USB chameleon connection might cause
-interference.
-
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
- 'components': ['OS>Kernel>Audio'],
- 'owner': 'cychiang@chromium.org',
- 'status': None,
- 'summary': None,
- 'title': None,
- 'cc': ['kalin@chromium.org', 'conradlo@chromium.org',
- 'chromeos-audio-bugs@google.com']
-}
-
-args_dict['name'] = NAME
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['max_runtime_mins'] = 120
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.audio_basic b/test_suites/control.audio_basic
deleted file mode 100644
index 015cbaf..0000000
--- a/test_suites/control.audio_basic
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright (c) 2019 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.
-
-AUTHOR = "The Chromium OS Authors,chromeos-audio-sw@google.com"
-NAME = "audio_basic"
-PURPOSE = "Suite for testing basic audio functionalities across devices."
-
-TIME = "MEDIUM"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-Audio tests that cover basic audio functionalities of CRAS for different
-devices.
-
-The tests require chameleon and audio boards connected. For stability, all
-cables should be plugged constantly without the jack plugger involved.
-
-USB audio shouldn't be configured with other audio devices like 3.5mm headset
-as there is a known issue that USB chameleon connection might cause
-interference.
-
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
- 'components': ['OS>Kernel>Audio'],
- 'owner': 'cychiang@chromium.org',
- 'status': None,
- 'summary': None,
- 'title': None,
- 'cc': ['kalin@chromium.org', 'conradlo@chromium.org',
- 'chromeos-audio-bugs@google.com']
-}
-
-args_dict['name'] = NAME
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['max_runtime_mins'] = 120
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.audio_essential b/test_suites/control.audio_essential
deleted file mode 100644
index 2c55135..0000000
--- a/test_suites/control.audio_essential
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright (c) 2019 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.
-
-AUTHOR = "The Chromium OS Authors,chromeos-audio-sw@google.com"
-NAME = "audio_essential"
-PURPOSE = "Suite for testing essential audio functionalities."
-
-TIME = "MEDIUM"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-Audio tests that cover audio functionalities that are essential to the
-Chrome OS audio stack.
-
-Generally the tests require chameleon and audio boards connected.
-Together with DUT and jack plugger bundled in audio-box environment for
-end-to-end testing. Details on go/audioboard, go/audiobox, go/ab-care-and-feed
-go/chameleon-audio-conf and go/cras-test-green.
-
-The audio boxes set up for this suites shouldn't be with USB audio peripherals
-as there is a known issue that USB chameleon connection might cause
-interference.
-
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
- 'components': ['OS>Kernel>Audio'],
- 'owner': 'cychiang@chromium.org',
- 'status': None,
- 'summary': None,
- 'title': None,
- 'cc': ['kalin@chromium.org', 'conradlo@chromium.org',
- 'chromeos-audio-bugs@google.com']
-}
-
-args_dict['name'] = NAME
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['max_runtime_mins'] = 120
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.av-analysis_per-build b/test_suites/control.av-analysis_per-build
deleted file mode 100644
index 40fa074..0000000
--- a/test_suites/control.av-analysis_per-build
+++ /dev/null
@@ -1,38 +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.
-
-AUTHOR = "chromeos-gfx"
-NAME = "av-analysis_per-build"
-PURPOSE = "Graphics tests for screen capturing analysis."
-
-TIME = "MEDIUM"
-TEST_CATEGORY = "Graphics"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the part of the graphics test suite for screen capturing analysis
-which should run once per build.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['max_runtime_mins'] = 240
-args_dict['timeout_mins'] = 1440
-args_dict['file_bugs'] = False
-args_dict['name'] = 'av-analysis_per-build'
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.av-analysis_per-day b/test_suites/control.av-analysis_per-day
deleted file mode 100644
index 8b9690d..0000000
--- a/test_suites/control.av-analysis_per-day
+++ /dev/null
@@ -1,38 +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.
-
-AUTHOR = "chromeos-gfx"
-NAME = "av-analysis_per-day"
-PURPOSE = "Graphics tests for screen capturing analysis."
-
-TIME = "MEDIUM"
-TEST_CATEGORY = "Graphics"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the part of the graphics test suite for screen capturing analysis
-which should run once every day.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['max_runtime_mins'] = 240
-args_dict['timeout_mins'] = 2880
-args_dict['file_bugs'] = False
-args_dict['name'] = 'av-analysis_per-day'
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.av-analysis_per-week b/test_suites/control.av-analysis_per-week
deleted file mode 100644
index f5d7da7..0000000
--- a/test_suites/control.av-analysis_per-week
+++ /dev/null
@@ -1,38 +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.
-
-AUTHOR = "chromeos-gfx"
-NAME = "av-analysis_per-week"
-PURPOSE = "Graphics tests for screen capturing analysis."
-
-TIME = "MEDIUM"
-TEST_CATEGORY = "Graphics"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the part of the graphics test suite for screen capturing analysis
-which should run once every week.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['max_runtime_mins'] = 240
-args_dict['timeout_mins'] = 4320
-args_dict['file_bugs'] = False
-args_dict['name'] = 'av-analysis_per-week'
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.av-analysis_trace_per-build b/test_suites/control.av-analysis_trace_per-build
deleted file mode 100644
index 5b1d58b..0000000
--- a/test_suites/control.av-analysis_trace_per-build
+++ /dev/null
@@ -1,38 +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.
-
-AUTHOR = "chromeos-gfx"
-NAME = "av-analysis_trace_per-build"
-PURPOSE = "Graphics trace tests for screen capturing analysis."
-
-TIME = "MEDIUM"
-TEST_CATEGORY = "Graphics"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the part of the graphics trace test suite for screen capturing analysis
-which should run once per build.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['max_runtime_mins'] = 720
-args_dict['timeout_mins'] = 1440
-args_dict['file_bugs'] = False
-args_dict['name'] = 'av-analysis_trace_per-build'
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.av-analysis_trace_per-day b/test_suites/control.av-analysis_trace_per-day
deleted file mode 100644
index 0cbd1de..0000000
--- a/test_suites/control.av-analysis_trace_per-day
+++ /dev/null
@@ -1,38 +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.
-
-AUTHOR = "chromeos-gfx"
-NAME = "av-analysis_trace_per-day"
-PURPOSE = "Graphics trace tests for screen capturing analysis."
-
-TIME = "MEDIUM"
-TEST_CATEGORY = "Graphics"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the part of the graphics trace test suite for screen capturing analysis
-which should run once every day.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['max_runtime_mins'] = 720
-args_dict['timeout_mins'] = 2880
-args_dict['file_bugs'] = False
-args_dict['name'] = 'av-analysis_trace_per-day'
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.av-analysis_trace_per-week b/test_suites/control.av-analysis_trace_per-week
deleted file mode 100644
index 09806e6..0000000
--- a/test_suites/control.av-analysis_trace_per-week
+++ /dev/null
@@ -1,38 +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.
-
-AUTHOR = "chromeos-gfx"
-NAME = "av-analysis_trace_per-week"
-PURPOSE = "Graphics trace tests for screen capturing analysis."
-
-TIME = "MEDIUM"
-TEST_CATEGORY = "Graphics"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the part of the graphics trace test suite for screen capturing analysis
-which should run once every week.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['max_runtime_mins'] = 720
-args_dict['timeout_mins'] = 4320
-args_dict['file_bugs'] = False
-args_dict['name'] = 'av-analysis_trace_per-week'
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.av_webcam b/test_suites/control.av_webcam
deleted file mode 100644
index 25b0fc3..0000000
--- a/test_suites/control.av_webcam
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2015 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.
-
-AUTHOR = "vsuley"
-NAME = "av_webcam"
-PURPOSE = "To run webrtc camera tests on devices with sufficient lighting."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-Run tests that use real camera. We are creating this suite to distinguish other camera tests that may use fake streams.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['suite_dependencies'] = 'webcam'
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 60
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bluestreak-partners b/test_suites/control.bluestreak-partners
deleted file mode 100644
index 332dbf6..0000000
--- a/test_suites/control.bluestreak-partners
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (c) 2017 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.
-
-AUTHOR = "denniswu@chromium.org"
-NAME = "bluestreak-partners"
-PURPOSE = "Automated testing of bluestreak/cfm used by third party vendors/testers"
-
-TIME = "LONG"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "suite"
-TEST_TYPE = "server"
-
-DOC = """
-This suite runs a set of bluestreak/cfm tests on bluestreak kits at third party vendors/testers sites using Moblab.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-
-
-args_dict['name'] = NAME
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bluestreak-pre-cq b/test_suites/control.bluestreak-pre-cq
deleted file mode 100644
index fef6f9f..0000000
--- a/test_suites/control.bluestreak-pre-cq
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2017 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.
-
-AUTHOR = "harpreet@chromium.org"
-NAME = "bluestreak-pre-cq"
-PURPOSE = "Suite with baseline set of tests that act as bluestreak pre-cq."
-TIME = "SHORT"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite acts as a pre-cq specific to ChromeOS bluestreak (CFM) related
-changes and is only invoked via a flag in CLs.
-
-@param build: The name of the image to test.
-@param board: The board to test on.
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-@param file_bugs: If True your suite will file bugs on failures.
-@param max_run_time: Amount of time each test shoud run in minutes.i
-
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['max_runtime_mins'] = 60
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bluetooth b/test_suites/control.bluetooth
deleted file mode 100644
index e88726d..0000000
--- a/test_suites/control.bluetooth
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (c) 2013 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bluetooth"
-PURPOSE = "Automated testing of Bluetooth."
-
-TIME = "LONG"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite runs the complete set of stable Bluetooth functional tests for our hardware and
-software.
-
-suite:bluetooth is a combination of suite:bluetooth_standalone and suite:bluetooth_e2e
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['add_experimental'] = True
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bluetooth_e2e b/test_suites/control.bluetooth_e2e
deleted file mode 100644
index a28bf34..0000000
--- a/test_suites/control.bluetooth_e2e
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2013 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bluetooth_e2e"
-PURPOSE = "Automated testing of Bluetooth."
-
-TIME = "LONG"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite runs the set of tests which requires a Bluetooth peer device setup.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['add_experimental'] = True
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bluetooth_e2e_cq b/test_suites/control.bluetooth_e2e_cq
deleted file mode 100644
index 6aff6e1..0000000
--- a/test_suites/control.bluetooth_e2e_cq
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (c) 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.
-
-AUTHOR = "Chrome OS Bluetooth Team"
-NAME = "bluetooth_e2e_cq"
-PURPOSE = "Bluetooth tests to be included in rfcell CQ"
-
-TIME = "Medium"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite contains e2e bluetooth tests that require Bluetooth peers
-to be run in rfcell CQ
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['add_experimental'] = True
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bluetooth_flaky b/test_suites/control.bluetooth_flaky
deleted file mode 100644
index 80f0695..0000000
--- a/test_suites/control.bluetooth_flaky
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (c) 2013 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bluetooth_flaky"
-PURPOSE = "Automated testing of Bluetooth."
-
-TIME = "LONG"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite contains flaky bluetooth tests. The test will be moved to other suites
-as they are fixed and becomes stable
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['add_experimental'] = True
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bluetooth_health b/test_suites/control.bluetooth_health
deleted file mode 100644
index 8db9012..0000000
--- a/test_suites/control.bluetooth_health
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (c) 2013 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bluetooth_health"
-PURPOSE = "Automated health testing of Bluetooth."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite runs a series of basic health tests against our Bluetooth hardware
-and software. It is the minimum necessary to ensure Bluetooth works on a
-particular build or board.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['name'] = 'bluetooth_health'
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bluetooth_mtbf b/test_suites/control.bluetooth_mtbf
deleted file mode 100644
index 510488b..0000000
--- a/test_suites/control.bluetooth_mtbf
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (c) 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bluetooth_mtbf"
-PURPOSE = "Automated mtbf testing of Bluetooth."
-
-TIME = "LONG"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite runs a series of bluetooth mtbf tests against our Bluetooth hardware
-and software.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['name'] = 'bluetooth_mtbf'
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bluetooth_qualification b/test_suites/control.bluetooth_qualification
deleted file mode 100644
index 4df7f2d..0000000
--- a/test_suites/control.bluetooth_qualification
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (c) 2013 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bluetooth_qualification"
-PURPOSE = "Automated qualification testing of Bluetooth."
-
-TIME = "LONG"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite runs the complete set of Bluetooth SIG Qualification tests against
-our Bluetooth hardware and software.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['name'] = 'bluetooth_qualification'
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bluetooth_standalone b/test_suites/control.bluetooth_standalone
deleted file mode 100644
index 0252a71..0000000
--- a/test_suites/control.bluetooth_standalone
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (c) 2013 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bluetooth_standalone"
-PURPOSE = "Automated testing of Bluetooth."
-
-TIME = "LONG"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite runs set of bluetooth test which does not need a peer device or wificell.
-
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['add_experimental'] = True
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bluetooth_standalone_cq b/test_suites/control.bluetooth_standalone_cq
deleted file mode 100644
index 281ae24..0000000
--- a/test_suites/control.bluetooth_standalone_cq
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 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.
-
-AUTHOR = "Chrome OS Bluetooth Team"
-NAME = "bluetooth_standalone_cq"
-PURPOSE = "Standalone Bluetooth tests to be included in CQ"
-
-TIME = "Medium"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite contains standalone bluetooth tests (requires only DUT) to be run in CQ
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['add_experimental'] = True
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bluetooth_stress b/test_suites/control.bluetooth_stress
deleted file mode 100644
index 713d01c..0000000
--- a/test_suites/control.bluetooth_stress
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (c) 2017 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bluetooth_stress"
-PURPOSE = "Automated stress testing of Bluetooth."
-
-TIME = "LONG"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite runs a series of stress tests against our Bluetooth hardware
-and software. It is the necessary to ensure Bluetooth works on a
-particular build or board
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['name'] = 'bluetooth_stress'
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bluetooth_wifi_coex b/test_suites/control.bluetooth_wifi_coex
deleted file mode 100644
index 8314e66..0000000
--- a/test_suites/control.bluetooth_wifi_coex
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2013 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bluetooth_wifi_coex"
-PURPOSE = "Automated testing of Bluetooth."
-
-TIME = "LONG"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite tests Bluetooth/WiFi coexistence.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['add_experimental'] = True
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.brillo-audio b/test_suites/control.brillo-audio
deleted file mode 100644
index 061c4b6..0000000
--- a/test_suites/control.brillo-audio
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2016 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.
-
-AUTHOR = "ralphnathan"
-NAME = "brillo-audio"
-PURPOSE = "Test audio functionality on brillo."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-Suite for kicking off the Brillo audio specific PTS tests. Requires a loopback
-device to be connected to the DUT.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-
-args_dict['max_runtime_mins'] = 20
-args_dict['name'] = 'brillo-audio'
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.brillo-bvt b/test_suites/control.brillo-bvt
deleted file mode 100644
index f36a37f..0000000
--- a/test_suites/control.brillo-bvt
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2015 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.
-
-AUTHOR = "Brillo Team"
-NAME = "brillo-bvt"
-PURPOSE = "Test critical brillo functionality."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-Suite for kicking off the Brillo PTS tests.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-
-args_dict['max_runtime_mins'] = 20
-args_dict['name'] = 'brillo-bvt'
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.brillo-experimental b/test_suites/control.brillo-experimental
deleted file mode 100644
index 98f9c40..0000000
--- a/test_suites/control.brillo-experimental
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2016 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.
-
-AUTHOR = "Brillo Team"
-NAME = "brillo-experimental"
-PURPOSE = "Run experimental tests from Brillo private test repo."
-
-TIME = "LENGTHY"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-Suite for running experimental Brillo tests.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-
-args_dict['max_runtime_mins'] = 300
-args_dict['name'] = NAME
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.brillo-postsubmit b/test_suites/control.brillo-postsubmit
deleted file mode 100644
index 7195c74..0000000
--- a/test_suites/control.brillo-postsubmit
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2016 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.
-
-AUTHOR = "Brillo Team"
-NAME = "brillo-postsubmit"
-PURPOSE = "Test basic brillo functionality after builds."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-Suite for kicking off the Brillo postsubmit testing.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-
-args_dict['max_runtime_mins'] = 20
-args_dict['name'] = 'brillo-postsubmit'
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.brillo-presubmit b/test_suites/control.brillo-presubmit
deleted file mode 100644
index d180b40..0000000
--- a/test_suites/control.brillo-presubmit
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2016 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.
-
-AUTHOR = "Brillo Team"
-NAME = "brillo-presubmit"
-PURPOSE = "Test basic brillo functionality in the submit queue."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-Suite for kicking off the Brillo presubmit testing. Runs on emulators and
-physical devices. WiFi, fastboot and other hardware or bootloader related tests
-must not be added to this suite.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-
-args_dict['max_runtime_mins'] = 20
-args_dict['name'] = 'brillo-presubmit'
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.brillo-smoke b/test_suites/control.brillo-smoke
deleted file mode 100644
index c335d63..0000000
--- a/test_suites/control.brillo-smoke
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2016 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.
-
-AUTHOR = "Brillo Team"
-NAME = "brillo-smoke"
-PURPOSE = "Test critical brillo functionality."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-Suite for kicking off a subset of the Brillo PTS tests, particularly for VM
-testing.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-
-args_dict['max_runtime_mins'] = 20
-args_dict['name'] = 'brillo-smoke'
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-arc b/test_suites/control.bvt-arc
deleted file mode 100644
index 67ced11..0000000
--- a/test_suites/control.bvt-arc
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2017 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-arc"
-PURPOSE = "Test basic functionality of ARC."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the portion of the Build Verification Test suite required
-for devices supporting ARC. Tests in this suite must pass in the
-CQ, and in the Chrome and Android PFQs. Test failures prevent code
-from being included in the tree or in canary builds:
- * Failures in the canary turn the tree red, block lower priority
- tests for the build, and generally mean that QA cannot further
- evaluate the build's fitness for release.
- * Chrome OS CLs must pass these tests in the Commit Queue prior to
- being accepted into the tree.
- * A new Chrome or Android build must pass these tests prior to the
- build being included in a Chrome OS canary build.
-
-Requirements for a test to be in this suite:
- 1. The test should be SHORT or MEDIUM, and should not require any
- specialized lab resources.
- 2. A test failure should indicate one or more of the following
- impacts is possible:
- * The failure may prevent discovery of other ARC bugs.
- * The failure may block ordinary development tasks for ARC.
- 3. A test failure must reliably indicate a bug in the product, and
- not a bug in the test.
- 4. The test must be hermetic. That is, the test should have no
- dependencies on external network resources.
-
-@param build: The name of the image to test.
- Ex: veyron_minnie-release/R60-9575.0.0
-@param board: The board to test on. Ex: veyron_minnie
-@param pool: The pool of machines to utilize for scheduling.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to its defaults.
-_BUG_TEMPLATE = {
- 'labels': ['bvt'],
- 'owner': '',
- 'status': None,
- 'summary': None,
- 'title': None,
-}
-
-args_dict['max_runtime_mins'] = 60
-args_dict['name'] = 'bvt-arc'
-args_dict['job'] = job
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-cq b/test_suites/control.bvt-cq
deleted file mode 100644
index 29dbdc0..0000000
--- a/test_suites/control.bvt-cq
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright (c) 2014 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-cq"
-PURPOSE = "Test functionality required by the Commit Queue."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the portion of the Build Verification Test suite required to
-pass the Chrome OS Commit Queue and Pre-Flight Queue. Test failures
-prevent code from being included in the tree or in canary builds:
- * Chrome OS CLs must pass these tests prior to being accepted into
- the tree.
- * A new Chrome build must pass these tests prior to the build
- being included in a Chrome OS canary build.
-
-Requirements for a test to be in this suite:
- 1. The test should be SHORT, and should not require any specialized
- lab resources.
- 2. A test failure should indicate that the product is not fit for
- release on any channel.
- 3. A test failure must reliably indicate a bug in the product, and
- not a bug in the test.
- 4. The test must be hermetic. That is, the test should have no
- dependencies on external network resources.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
- 'labels': ['bvt'],
- 'owner': '',
- 'status': None,
- 'summary': None,
- 'title': None,
-}
-
-args_dict['max_runtime_mins'] = 30
-args_dict['name'] = 'bvt-cq'
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-faft b/test_suites/control.bvt-faft
deleted file mode 100644
index 0270bb6..0000000
--- a/test_suites/control.bvt-faft
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright (c) 2019 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-faft"
-PURPOSE = "Run critical FAFT tests for BVT."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the FAFT (fully automated firmware test) portion of the Build
-Verification Test suite required to pass before any other tests may run.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
- 'labels': ['FW-labblocker', 'Restrict-View-Google'],
- 'owner': '',
- 'status': None,
- 'summary': None,
- 'title': None,
-}
-
-args_dict['max_runtime_mins'] = 30
-args_dict['name'] = 'bvt-faft'
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-inline b/test_suites/control.bvt-inline
deleted file mode 100644
index c93df23..0000000
--- a/test_suites/control.bvt-inline
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright (c) 2014 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-inline"
-PURPOSE = "Test critical functionality."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the portion of the Build Verification Test suite required
-to pass before any other tests may run. Test failures in this
-suite trigger automatic actions:
- * Failures in the Commit Queue or Pre-Flight Queue fail the build,
- and block running tests from the bvt-cq suite.
- * Failures in the canary turn the tree red, block all other tests
- for the build, and generally mean that QA cannot further
- evaluate the build's fitness for release.
-
-Requirements for a test to be in this suite:
- 1. The test should be SHORT, and should not require any specialized
- lab resources.
- 2. A test failure should indicate one or more of the following
- impacts is possible:
- * The failure may impact the stability of the test lab.
- * The failure may prevent discovery of other bugs.
- * The failure may block ordinary development tasks.
- 3. A test failure must reliably indicate a bug in the product, and
- not a bug in the test.
- 4. The test must be hermetic. That is, the test should have no
- dependencies on external network resources.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
- 'labels': ['bvt'],
- 'owner': '',
- 'status': None,
- 'summary': None,
- 'title': None,
-}
-
-args_dict['max_runtime_mins'] = 30
-args_dict['name'] = 'bvt-inline'
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-installer b/test_suites/control.bvt-installer
deleted file mode 100644
index 143a6a6..0000000
--- a/test_suites/control.bvt-installer
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2017 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-installer"
-PURPOSE = "Build verification of ChromeOS pieces related to Installer."
-
-TIME = "MEDIUM"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite is used for testing pieces in ChromeOS that would be covered by
-the Internals>Installer component (e.g Powerwash). It is run on
-the canary and release builders, but not the CQ or PFQ's. These tests are
-being split from bvt-inline as their average runtime is not acceptable for
-that suite.
-
-@param build: The name of the image to test.
- Ex: veyron_minnie-release/R60-9575.0.0
-@param board: The board to test on. Ex: veyron_minnie
-@param pool: The pool of machines to utilize for scheduling.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['max_runtime_mins'] = 60
-args_dict['name'] = 'bvt-installer'
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-perbuild b/test_suites/control.bvt-perbuild
deleted file mode 100644
index fc4c19d..0000000
--- a/test_suites/control.bvt-perbuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright (c) 2014 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-perbuild"
-PURPOSE = "Test basic, required functionality."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the portion of the Build Verification Test suite required to
-pass on every canary build. These tests are run against canary
-builds only; failures in this suite are evaluated by QA, and
-normally will block release.
-
-Requirements for a test to be in this suite:
- 1. The test should be SHORT or MEDIUM, and should not require any
- specialized lab resources.
- 2. A test failure should indicate that the product is not fit for
- release on any channel.
- 3. A test failure should indicate a bug in the product, and not a
- bug in the test.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
- 'labels': ['bvt'],
- 'owner': '',
- 'status': None,
- 'summary': None,
- 'title': None,
-}
-
-args_dict['max_runtime_mins'] = 60
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['name'] = 'bvt-perbuild'
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-android-pfq b/test_suites/control.bvt-tast-android-pfq
deleted file mode 100644
index 3dd2d45..0000000
--- a/test_suites/control.bvt-tast-android-pfq
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2018 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-android-pfq"
-PURPOSE = "Tests critical ARC functionality for Android PFQ using Tast."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies ARC's basic functionality for the Android Pre-Flight Queue
-by running ARC-specific Tast integration tests that must always pass against a
-DUT. See http://go/tast for more information about Tast.
-
-The following Autotest tests are executed by this suite:
-- tast.critical-android, which is a server test that executes the tast
-executable. The tast executable runs individual Tast tests. If any of these Tast
-tests fail, then tast.critical-android (and this suite) fail.
-- tast.arc-data-collector, which launches the arc.DataCollector Tast test to
-collect runtime artifacts from the DUT for future optimization."""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 20
-args_dict['timeout_mins'] = 1440
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-arc b/test_suites/control.bvt-tast-arc
deleted file mode 100644
index ac74de7..0000000
--- a/test_suites/control.bvt-tast-arc
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-arc"
-PURPOSE = "Tests critical ARC functionality for Chrome OS CQ using Tast."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies ARC's basic functionality for ARC variant boards
-(e.g. *-arc-r) in the Chrome OS CQ, by running ARC-specific Tast integration
-tests that must always pass against a DUT. See http://go/tast for more
-information about Tast.
-
-The only Autotest test executed by this suite is tast.critical-android, which is
-a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then
-tast.critical-android (and this suite) fail. """
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 20
-args_dict['timeout_mins'] = 1440
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-chrome-pfq b/test_suites/control.bvt-tast-chrome-pfq
deleted file mode 100644
index 2a546b0..0000000
--- a/test_suites/control.bvt-tast-chrome-pfq
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2018 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-chrome-pfq"
-PURPOSE = "Tests critical Chrome functionality for Chrome PFQ using Tast."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome's basic functionality for the Chrome Pre-Flight Queue
-by running all Chrome and ARC (since ARC depends on Chrome) Tast integration
-tests that must always pass against a DUT. See http://go/tast for more
-information about Tast.
-
-The only Autotest tests executed by this suite are tast.critical-chrome and
-tast.critical-android, which are server tests that execute the tast executable.
-The tast executable runs individual Tast tests. If any of these Tast tests fail,
-then the corresponding tast.critical test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 20
-args_dict['timeout_mins'] = 1440
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq b/test_suites/control.bvt-tast-cq
deleted file mode 100644
index 9e13058..0000000
--- a/test_suites/control.bvt-tast-cq
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2018 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq"
-PURPOSE = "Tests all critical functionality for Chrome OS CQ using Tast."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests (exercising ARC, Chrome, and the OS
-itself) that must always pass against a DUT. See http://go/tast for more
-information about Tast.
-
-The only Autotest tests executed by this suite are tast.critical-*, which are
-server tests that execute the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the corresponding
-tast.critical test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 20
-args_dict['timeout_mins'] = 1440
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-a11y b/test_suites/control.bvt-tast-cq-a11y
deleted file mode 100644
index a94aca6..0000000
--- a/test_suites/control.bvt-tast-cq-a11y
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-a11y"
-PURPOSE = 'Tests the critical Tast tests in the "a11y" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "a11y" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-a11y, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-a11y test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-ad b/test_suites/control.bvt-tast-cq-ad
deleted file mode 100644
index 99d98d1..0000000
--- a/test_suites/control.bvt-tast-cq-ad
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-ad"
-PURPOSE = 'Tests the critical Tast tests in the "ad" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "ad" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-ad, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-ad test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-ambient b/test_suites/control.bvt-tast-cq-ambient
deleted file mode 100644
index 6927a84..0000000
--- a/test_suites/control.bvt-tast-cq-ambient
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-ambient"
-PURPOSE = 'Tests the critical Tast tests in the "ambient" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "ambient" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-ambient, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-ambient test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-apps b/test_suites/control.bvt-tast-cq-apps
deleted file mode 100644
index e4f66ec..0000000
--- a/test_suites/control.bvt-tast-cq-apps
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-apps"
-PURPOSE = 'Tests the critical Tast tests in the "apps" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "apps" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-apps, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-apps test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-arc b/test_suites/control.bvt-tast-cq-arc
deleted file mode 100644
index a2c8702..0000000
--- a/test_suites/control.bvt-tast-cq-arc
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-arc"
-PURPOSE = 'Tests the critical Tast tests in the "arc" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "arc" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-arc, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-arc test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-arcappcompat b/test_suites/control.bvt-tast-cq-arcappcompat
deleted file mode 100644
index 1eab0cb..0000000
--- a/test_suites/control.bvt-tast-cq-arcappcompat
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-arcappcompat"
-PURPOSE = 'Tests the critical Tast tests in the "arcappcompat" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "arcappcompat" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-arcappcompat, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-arcappcompat test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-assistant b/test_suites/control.bvt-tast-cq-assistant
deleted file mode 100644
index 2966ad9..0000000
--- a/test_suites/control.bvt-tast-cq-assistant
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-assistant"
-PURPOSE = 'Tests the critical Tast tests in the "assistant" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "assistant" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-assistant, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-assistant test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-audio b/test_suites/control.bvt-tast-cq-audio
deleted file mode 100644
index 3d64fbd..0000000
--- a/test_suites/control.bvt-tast-cq-audio
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-audio"
-PURPOSE = 'Tests the critical Tast tests in the "audio" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "audio" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-audio, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-audio test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-baserpc b/test_suites/control.bvt-tast-cq-baserpc
deleted file mode 100644
index 286e0c8..0000000
--- a/test_suites/control.bvt-tast-cq-baserpc
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-baserpc"
-PURPOSE = 'Tests the critical Tast tests in the "baserpc" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "baserpc" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-baserpc, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-baserpc test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-biod b/test_suites/control.bvt-tast-cq-biod
deleted file mode 100644
index 0ca4591..0000000
--- a/test_suites/control.bvt-tast-cq-biod
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-biod"
-PURPOSE = 'Tests the critical Tast tests in the "biod" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "biod" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-biod, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-biod test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-camera b/test_suites/control.bvt-tast-cq-camera
deleted file mode 100644
index 34bc58a..0000000
--- a/test_suites/control.bvt-tast-cq-camera
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-camera"
-PURPOSE = 'Tests the critical Tast tests in the "camera" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "camera" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-camera, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-camera test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-crash b/test_suites/control.bvt-tast-cq-crash
deleted file mode 100644
index 11b11b1..0000000
--- a/test_suites/control.bvt-tast-cq-crash
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-crash"
-PURPOSE = 'Tests the critical Tast tests in the "crash" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "crash" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-crash, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-crash test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-crostini b/test_suites/control.bvt-tast-cq-crostini
deleted file mode 100644
index 4e23c47..0000000
--- a/test_suites/control.bvt-tast-cq-crostini
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-crostini"
-PURPOSE = 'Tests the critical Tast tests in the "crostini" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "crostini" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-crostini, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-crostini test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-cryptohome b/test_suites/control.bvt-tast-cq-cryptohome
deleted file mode 100644
index 6913671..0000000
--- a/test_suites/control.bvt-tast-cq-cryptohome
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-cryptohome"
-PURPOSE = 'Tests the critical Tast tests in the "cryptohome" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "cryptohome" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-cryptohome, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-cryptohome test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-dbus b/test_suites/control.bvt-tast-cq-dbus
deleted file mode 100644
index 42e95ad..0000000
--- a/test_suites/control.bvt-tast-cq-dbus
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-dbus"
-PURPOSE = 'Tests the critical Tast tests in the "dbus" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "dbus" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-dbus, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-dbus test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-debugd b/test_suites/control.bvt-tast-cq-debugd
deleted file mode 100644
index d5db66f..0000000
--- a/test_suites/control.bvt-tast-cq-debugd
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-debugd"
-PURPOSE = 'Tests the critical Tast tests in the "debugd" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "debugd" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-debugd, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-debugd test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-dev b/test_suites/control.bvt-tast-cq-dev
deleted file mode 100644
index 82ade06..0000000
--- a/test_suites/control.bvt-tast-cq-dev
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-dev"
-PURPOSE = 'Tests the critical Tast tests in the "dev" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "dev" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-dev, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-dev test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-diagnostics b/test_suites/control.bvt-tast-cq-diagnostics
deleted file mode 100644
index 07005a2..0000000
--- a/test_suites/control.bvt-tast-cq-diagnostics
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-diagnostics"
-PURPOSE = 'Tests the critical Tast tests in the "diagnostics" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "diagnostics" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-diagnostics, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-diagnostics test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-documentscanapi b/test_suites/control.bvt-tast-cq-documentscanapi
deleted file mode 100644
index 04ffcc6..0000000
--- a/test_suites/control.bvt-tast-cq-documentscanapi
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-documentscanapi"
-PURPOSE = 'Tests the critical Tast tests in the "documentscanapi" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "documentscanapi" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-documentscanapi, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-documentscanapi test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-enterprise b/test_suites/control.bvt-tast-cq-enterprise
deleted file mode 100644
index ad13e96..0000000
--- a/test_suites/control.bvt-tast-cq-enterprise
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-enterprise"
-PURPOSE = 'Tests the critical Tast tests in the "enterprise" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "enterprise" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-enterprise, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-enterprise test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-example b/test_suites/control.bvt-tast-cq-example
deleted file mode 100644
index 6d833da..0000000
--- a/test_suites/control.bvt-tast-cq-example
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-example"
-PURPOSE = 'Tests the critical Tast tests in the "example" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "example" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-example, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-example test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-factory b/test_suites/control.bvt-tast-cq-factory
deleted file mode 100644
index 639159f..0000000
--- a/test_suites/control.bvt-tast-cq-factory
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-factory"
-PURPOSE = 'Tests the critical Tast tests in the "factory" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "factory" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-factory, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-factory test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-familylink b/test_suites/control.bvt-tast-cq-familylink
deleted file mode 100644
index 823bfe9..0000000
--- a/test_suites/control.bvt-tast-cq-familylink
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-familylink"
-PURPOSE = 'Tests the critical Tast tests in the "familylink" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "familylink" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-familylink, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-familylink test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-feedback b/test_suites/control.bvt-tast-cq-feedback
deleted file mode 100644
index 74a6cd0..0000000
--- a/test_suites/control.bvt-tast-cq-feedback
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-feedback"
-PURPOSE = 'Tests the critical Tast tests in the "feedback" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "feedback" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-feedback, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-feedback test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-filemanager b/test_suites/control.bvt-tast-cq-filemanager
deleted file mode 100644
index 1cff663..0000000
--- a/test_suites/control.bvt-tast-cq-filemanager
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-filemanager"
-PURPOSE = 'Tests the critical Tast tests in the "filemanager" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "filemanager" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-filemanager, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-filemanager test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-firmware b/test_suites/control.bvt-tast-cq-firmware
deleted file mode 100644
index 134e570..0000000
--- a/test_suites/control.bvt-tast-cq-firmware
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-firmware"
-PURPOSE = 'Tests the critical Tast tests in the "firmware" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "firmware" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-firmware, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-firmware test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-gamepad b/test_suites/control.bvt-tast-cq-gamepad
deleted file mode 100644
index 09395d0..0000000
--- a/test_suites/control.bvt-tast-cq-gamepad
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-gamepad"
-PURPOSE = 'Tests the critical Tast tests in the "gamepad" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "gamepad" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-gamepad, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-gamepad test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-graphics b/test_suites/control.bvt-tast-cq-graphics
deleted file mode 100644
index 426f9bc..0000000
--- a/test_suites/control.bvt-tast-cq-graphics
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-graphics"
-PURPOSE = 'Tests the critical Tast tests in the "graphics" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "graphics" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-graphics, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-graphics test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-hardware b/test_suites/control.bvt-tast-cq-hardware
deleted file mode 100644
index 0659b15..0000000
--- a/test_suites/control.bvt-tast-cq-hardware
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-hardware"
-PURPOSE = 'Tests the critical Tast tests in the "hardware" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "hardware" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-hardware, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-hardware test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-health b/test_suites/control.bvt-tast-cq-health
deleted file mode 100644
index bbeea3a..0000000
--- a/test_suites/control.bvt-tast-cq-health
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-health"
-PURPOSE = 'Tests the critical Tast tests in the "health" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "health" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-health, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-health test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-hwsec b/test_suites/control.bvt-tast-cq-hwsec
deleted file mode 100644
index c6677cd..0000000
--- a/test_suites/control.bvt-tast-cq-hwsec
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-hwsec"
-PURPOSE = 'Tests the critical Tast tests in the "hwsec" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "hwsec" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-hwsec, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-hwsec test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-inputs b/test_suites/control.bvt-tast-cq-inputs
deleted file mode 100644
index cccfff0..0000000
--- a/test_suites/control.bvt-tast-cq-inputs
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-inputs"
-PURPOSE = 'Tests the critical Tast tests in the "inputs" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "inputs" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-inputs, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-inputs test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-kernel b/test_suites/control.bvt-tast-cq-kernel
deleted file mode 100644
index 90e3943..0000000
--- a/test_suites/control.bvt-tast-cq-kernel
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-kernel"
-PURPOSE = 'Tests the critical Tast tests in the "kernel" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "kernel" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-kernel, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-kernel test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-lacros b/test_suites/control.bvt-tast-cq-lacros
deleted file mode 100644
index 7b415a1..0000000
--- a/test_suites/control.bvt-tast-cq-lacros
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-lacros"
-PURPOSE = 'Tests the critical Tast tests in the "lacros" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "lacros" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-lacros, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-lacros test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-launcher b/test_suites/control.bvt-tast-cq-launcher
deleted file mode 100644
index 55cb8c8c..0000000
--- a/test_suites/control.bvt-tast-cq-launcher
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-launcher"
-PURPOSE = 'Tests the critical Tast tests in the "launcher" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "launcher" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-launcher, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-launcher test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-logs b/test_suites/control.bvt-tast-cq-logs
deleted file mode 100644
index 0a776c8..0000000
--- a/test_suites/control.bvt-tast-cq-logs
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-logs"
-PURPOSE = 'Tests the critical Tast tests in the "logs" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "logs" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-logs, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-logs test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-meta b/test_suites/control.bvt-tast-cq-meta
deleted file mode 100644
index e70deb8..0000000
--- a/test_suites/control.bvt-tast-cq-meta
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-meta"
-PURPOSE = 'Tests the critical Tast tests in the "meta" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "meta" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-meta, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-meta test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-mlservice b/test_suites/control.bvt-tast-cq-mlservice
deleted file mode 100644
index fd47c21..0000000
--- a/test_suites/control.bvt-tast-cq-mlservice
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-mlservice"
-PURPOSE = 'Tests the critical Tast tests in the "mlservice" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "mlservice" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-mlservice, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-mlservice test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-multivm b/test_suites/control.bvt-tast-cq-multivm
deleted file mode 100644
index ac50ad1..0000000
--- a/test_suites/control.bvt-tast-cq-multivm
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-multivm"
-PURPOSE = 'Tests the critical Tast tests in the "multivm" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "multivm" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-multivm, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-multivm test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-nacl b/test_suites/control.bvt-tast-cq-nacl
deleted file mode 100644
index bfedb4d..0000000
--- a/test_suites/control.bvt-tast-cq-nacl
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-nacl"
-PURPOSE = 'Tests the critical Tast tests in the "nacl" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "nacl" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-nacl, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-nacl test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-nearbyshare b/test_suites/control.bvt-tast-cq-nearbyshare
deleted file mode 100644
index 64d8983..0000000
--- a/test_suites/control.bvt-tast-cq-nearbyshare
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-nearbyshare"
-PURPOSE = 'Tests the critical Tast tests in the "nearbyshare" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "nearbyshare" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-nearbyshare, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-nearbyshare test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-network b/test_suites/control.bvt-tast-cq-network
deleted file mode 100644
index 7b00006..0000000
--- a/test_suites/control.bvt-tast-cq-network
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-network"
-PURPOSE = 'Tests the critical Tast tests in the "network" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "network" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-network, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-network test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-notifications b/test_suites/control.bvt-tast-cq-notifications
deleted file mode 100644
index a064255..0000000
--- a/test_suites/control.bvt-tast-cq-notifications
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-notifications"
-PURPOSE = 'Tests the critical Tast tests in the "notifications" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "notifications" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-notifications, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-notifications test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-ocr b/test_suites/control.bvt-tast-cq-ocr
deleted file mode 100644
index b9bae8b..0000000
--- a/test_suites/control.bvt-tast-cq-ocr
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-ocr"
-PURPOSE = 'Tests the critical Tast tests in the "ocr" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "ocr" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-ocr, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-ocr test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-peripherals b/test_suites/control.bvt-tast-cq-peripherals
deleted file mode 100644
index 161c319..0000000
--- a/test_suites/control.bvt-tast-cq-peripherals
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-peripherals"
-PURPOSE = 'Tests the critical Tast tests in the "peripherals" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "peripherals" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-peripherals, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-peripherals test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-platform b/test_suites/control.bvt-tast-cq-platform
deleted file mode 100644
index 37ba551..0000000
--- a/test_suites/control.bvt-tast-cq-platform
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-platform"
-PURPOSE = 'Tests the critical Tast tests in the "platform" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "platform" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-platform, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-platform test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-policy b/test_suites/control.bvt-tast-cq-policy
deleted file mode 100644
index 38b1061..0000000
--- a/test_suites/control.bvt-tast-cq-policy
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-policy"
-PURPOSE = 'Tests the critical Tast tests in the "policy" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "policy" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-policy, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-policy test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-power b/test_suites/control.bvt-tast-cq-power
deleted file mode 100644
index 0bb1f0f..0000000
--- a/test_suites/control.bvt-tast-cq-power
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-power"
-PURPOSE = 'Tests the critical Tast tests in the "power" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "power" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-power, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-power test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-printer b/test_suites/control.bvt-tast-cq-printer
deleted file mode 100644
index c855eca..0000000
--- a/test_suites/control.bvt-tast-cq-printer
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-printer"
-PURPOSE = 'Tests the critical Tast tests in the "printer" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "printer" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-printer, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-printer test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-qemu b/test_suites/control.bvt-tast-cq-qemu
deleted file mode 100644
index d5d2c3d..0000000
--- a/test_suites/control.bvt-tast-cq-qemu
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-qemu"
-PURPOSE = 'Tests the critical Tast tests in the "qemu" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "qemu" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-qemu, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-qemu test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-scanapp b/test_suites/control.bvt-tast-cq-scanapp
deleted file mode 100644
index bfc1d8b..0000000
--- a/test_suites/control.bvt-tast-cq-scanapp
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-scanapp"
-PURPOSE = 'Tests the critical Tast tests in the "scanapp" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "scanapp" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-scanapp, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-scanapp test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-scanner b/test_suites/control.bvt-tast-cq-scanner
deleted file mode 100644
index c831792..0000000
--- a/test_suites/control.bvt-tast-cq-scanner
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-scanner"
-PURPOSE = 'Tests the critical Tast tests in the "scanner" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "scanner" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-scanner, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-scanner test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-sched b/test_suites/control.bvt-tast-cq-sched
deleted file mode 100644
index 799821a..0000000
--- a/test_suites/control.bvt-tast-cq-sched
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-sched"
-PURPOSE = 'Tests the critical Tast tests in the "sched" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "sched" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-sched, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-sched test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-screenshot b/test_suites/control.bvt-tast-cq-screenshot
deleted file mode 100644
index b3e10b5..0000000
--- a/test_suites/control.bvt-tast-cq-screenshot
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-screenshot"
-PURPOSE = 'Tests the critical Tast tests in the "screenshot" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "screenshot" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-screenshot, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-screenshot test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-security b/test_suites/control.bvt-tast-cq-security
deleted file mode 100644
index 285c163..0000000
--- a/test_suites/control.bvt-tast-cq-security
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-security"
-PURPOSE = 'Tests the critical Tast tests in the "security" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "security" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-security, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-security test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-session b/test_suites/control.bvt-tast-cq-session
deleted file mode 100644
index 27d483c..0000000
--- a/test_suites/control.bvt-tast-cq-session
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-session"
-PURPOSE = 'Tests the critical Tast tests in the "session" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "session" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-session, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-session test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-shelf b/test_suites/control.bvt-tast-cq-shelf
deleted file mode 100644
index 3c82924..0000000
--- a/test_suites/control.bvt-tast-cq-shelf
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-shelf"
-PURPOSE = 'Tests the critical Tast tests in the "shelf" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "shelf" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-shelf, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-shelf test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-storage b/test_suites/control.bvt-tast-cq-storage
deleted file mode 100644
index 07dfcd9..0000000
--- a/test_suites/control.bvt-tast-cq-storage
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-storage"
-PURPOSE = 'Tests the critical Tast tests in the "storage" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "storage" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-storage, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-storage test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-typec b/test_suites/control.bvt-tast-cq-typec
deleted file mode 100644
index 5e7acf8..0000000
--- a/test_suites/control.bvt-tast-cq-typec
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-typec"
-PURPOSE = 'Tests the critical Tast tests in the "typec" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "typec" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-typec, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-typec test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-u2fd b/test_suites/control.bvt-tast-cq-u2fd
deleted file mode 100644
index 4e1abbe..0000000
--- a/test_suites/control.bvt-tast-cq-u2fd
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-u2fd"
-PURPOSE = 'Tests the critical Tast tests in the "u2fd" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "u2fd" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-u2fd, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-u2fd test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-ui b/test_suites/control.bvt-tast-cq-ui
deleted file mode 100644
index edbd171..0000000
--- a/test_suites/control.bvt-tast-cq-ui
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-ui"
-PURPOSE = 'Tests the critical Tast tests in the "ui" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "ui" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-ui, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-ui test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-video b/test_suites/control.bvt-tast-cq-video
deleted file mode 100644
index 7c16d41..0000000
--- a/test_suites/control.bvt-tast-cq-video
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-video"
-PURPOSE = 'Tests the critical Tast tests in the "video" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "video" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-video, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-video test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-vm b/test_suites/control.bvt-tast-cq-vm
deleted file mode 100644
index 114196e..0000000
--- a/test_suites/control.bvt-tast-cq-vm
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-vm"
-PURPOSE = 'Tests the critical Tast tests in the "vm" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "vm" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-vm, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-vm test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-webrtc b/test_suites/control.bvt-tast-cq-webrtc
deleted file mode 100644
index 1cdf7a4..0000000
--- a/test_suites/control.bvt-tast-cq-webrtc
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-webrtc"
-PURPOSE = 'Tests the critical Tast tests in the "webrtc" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "webrtc" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-webrtc, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-webrtc test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-wifi b/test_suites/control.bvt-tast-cq-wifi
deleted file mode 100644
index e014224..0000000
--- a/test_suites/control.bvt-tast-cq-wifi
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-wifi"
-PURPOSE = 'Tests the critical Tast tests in the "wifi" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "wifi" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-wifi, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-wifi test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-cq-wilco b/test_suites/control.bvt-tast-cq-wilco
deleted file mode 100644
index 55b4244..0000000
--- a/test_suites/control.bvt-tast-cq-wilco
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-cq-wilco"
-PURPOSE = 'Tests the critical Tast tests in the "wilco" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies Chrome OS's basic functionality for the Chrome OS Commit
-Queue by running all Tast integration tests in the "wilco" category that must
-always pass against a DUT. See http://go/tast for more information about Tast.
-
-The only Autotest test executed by this suite is tast.category-wilco, which
-is a server test that executes the tast executable. The tast executable runs
-individual Tast tests. If any of these Tast tests fail, then the
-test.category-wilco test (and this suite) fail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-informational b/test_suites/control.bvt-tast-informational
deleted file mode 100644
index 9e222a5..0000000
--- a/test_suites/control.bvt-tast-informational
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2019 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-informational"
-PURPOSE = "Runs informational Tast tests."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite is used to run all informational Tast integration tests (exercising
-ARC, Chrome, and the OS itself) on release (a.k.a. canary) builders. See
-http://go/tast for more information about Tast.
-
-The only Autotest tests executed by this suite are tast.informational-*, which
-are server tests that execute the tast executable. The tast executable runs
-individual Tast tests. The results of these Tast tests are available via
-Stainless. The tast.informational-* tests and this suite always pass as long as
-the tast executable itself does not report failure (due to e.g. a lost SSH
-connection to the DUT or a timeout).
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 60
-args_dict['timeout_mins'] = 1440
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-parallels-cq b/test_suites/control.bvt-tast-parallels-cq
deleted file mode 100644
index 82f8529..0000000
--- a/test_suites/control.bvt-tast-parallels-cq
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-parallels-cq"
-PURPOSE = "Runs all critical Parallels Tast tests."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies basic Parallels functionality on Chrome OS for the Chrome
-OS Commit Queue by running all Parallels Tast integration tests that must
-always pass against a DUT.
-
-This suite should only be run against devices licensed for an appropriate
-version of Windows and Office. Contact parallels-cros@ for details about
-license specifics.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 20
-args_dict['timeout_mins'] = 1440
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.bvt-tast-parallels-informational b/test_suites/control.bvt-tast-parallels-informational
deleted file mode 100644
index 8043790..0000000
--- a/test_suites/control.bvt-tast-parallels-informational
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "bvt-tast-parallels-informational"
-PURPOSE = "Runs informational Parallels Tast tests."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite is used to run all informational Parallels Tast integration tests
-on release (a.k.a. canary) builders.
-
-This suite should only be run against devices licensed for an appropriate
-version of Windows and Office. Contact parallels-cros@ for details about
-license specifics.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 60
-args_dict['timeout_mins'] = 1440
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.calibration b/test_suites/control.calibration
deleted file mode 100644
index 65db9b5..0000000
--- a/test_suites/control.calibration
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = 'chromeos-lab-infrastructure'
-NAME = 'calibration'
-PURPOSE = 'Calibration check run in buildbot to ensure the build will not break duts'
-
-TIME = 'SHORT'
-TEST_CATEGORY = 'General'
-TEST_CLASS = 'suite'
-TEST_TYPE = 'Server'
-
-DOC = """
-This suite is intended to be run by buildbot as a calibration check of the build.
-It currently only contains a dummy_Pass test. It works by relying
-on the safety checks built into the provisioning code to identify bad builds.
-
-This suite is intended to block other bvt suites, and as such is highly
-restricted because of the potential performance costs.
-
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.camera-libcamera b/test_suites/control.camera-libcamera
deleted file mode 100644
index 76bf796..0000000
--- a/test_suites/control.camera-libcamera
+++ /dev/null
@@ -1,32 +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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "camera-libcamera"
-PURPOSE = "Suite to run camera tests in for libcamera build"
-TIME = "MEDIUM"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the cameara-libcamera test suite.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['add_experimental'] = True
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.camera-postsubmit b/test_suites/control.camera-postsubmit
deleted file mode 100644
index 90ae2db..0000000
--- a/test_suites/control.camera-postsubmit
+++ /dev/null
@@ -1,32 +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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "camera-postsubmit"
-PURPOSE = "Suite to run camera tests in postsubmit"
-TIME = "MEDIUM"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the cameara-postsubmit test suite.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['add_experimental'] = True
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.camerabox_facing-back b/test_suites/control.camerabox_facing-back
deleted file mode 100644
index 836458b..0000000
--- a/test_suites/control.camerabox_facing-back
+++ /dev/null
@@ -1,38 +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.
-
-AUTHOR = "ChromeOS Camera Team/chromeos-camera-eng@google.com"
-NAME = "camerabox_facing-back"
-PURPOSE = "Test back camera functionality in back facing camerabox setup."
-
-TIME = "MEDIUM"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is back facing camerabox test suite.
-
-The suite is for testing back camera functionality in back facing camerabox
-setup.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['suite_dependencies'] = 'camerabox_facing:back'
-args_dict['add_experimental'] = True
-args_dict['max_runtime_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.camerabox_facing-front b/test_suites/control.camerabox_facing-front
deleted file mode 100644
index 7737634..0000000
--- a/test_suites/control.camerabox_facing-front
+++ /dev/null
@@ -1,38 +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.
-
-AUTHOR = "ChromeOS Camera Team/chromeos-camera-eng@google.com"
-NAME = "camerabox_facing-front"
-PURPOSE = "Test front camera functionality in front facing camerabox setup."
-
-TIME = "MEDIUM"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is front facing camerabox test suite.
-
-The suite is for testing front camera functionality in front facing camerabox
-setup.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['suite_dependencies'] = 'camerabox_facing:front'
-args_dict['add_experimental'] = True
-args_dict['max_runtime_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.cellular-cq b/test_suites/control.cellular-cq
deleted file mode 100644
index 4ba01c5..0000000
--- a/test_suites/control.cellular-cq
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2021 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.
-
-AUTHOR = "Chrome OS Cellular Team"
-NAME = "cellular-cq"
-PURPOSE = "Cellular tests to be included in cellular CQ"
-
-TIME = "Medium"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite contains cellular tests to be run in cellular CQ
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['add_experimental'] = True
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.cellular_au b/test_suites/control.cellular_au
deleted file mode 100644
index 36e92ff..0000000
--- a/test_suites/control.cellular_au
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2017 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.
-
-AUTHOR = "David Haddock <dhaddock@chromium.org>"
-NAME = "cellular_au"
-PURPOSE = "Suite for automated cellular autoupdate tests."
-TIME = "SHORT"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite runs the cellular autoupdate tests on various devices in the lab.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['add_experimental'] = True
-args_dict['max_runtime_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.cellular_au_nightly b/test_suites/control.cellular_au_nightly
deleted file mode 100644
index 4dbb9d8..0000000
--- a/test_suites/control.cellular_au_nightly
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2017 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.
-
-AUTHOR = "David Haddock <dhaddock@chromium.org>"
-NAME = "cellular_au_nightly"
-PURPOSE = "Suite for automated cellular autoupdate tests."
-TIME = "SHORT"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite runs the cellular autoupdate tests on various devices in the lab.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['add_experimental'] = True
-args_dict['max_runtime_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.cellular_callbox b/test_suites/control.cellular_callbox
deleted file mode 100644
index 28c3b81..0000000
--- a/test_suites/control.cellular_callbox
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (c) 2021 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.
-
-AUTHOR = "Chrome OS Cellular Team"
-NAME = "cellular_callbox"
-PURPOSE = "Cellular callbox tests to be included in cellular callbox CQ"
-
-TIME = "Medium"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite contains cellular callbox tests that need to be
-run in cellular callbox CQ
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['add_experimental'] = True
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.cellular_endtoend b/test_suites/control.cellular_endtoend
deleted file mode 100644
index 53624c6..0000000
--- a/test_suites/control.cellular_endtoend
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2016 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.
-
-AUTHOR = "Harpreet Grewal <harpreet@chromium.org>"
-NAME = "cellular_endtoend"
-PURPOSE = "Suite for automated cellular end to end tests."
-TIME = "SHORT"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite runs the cellular end to end test on various devices in the lab.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['add_experimental'] = True
-args_dict['max_runtime_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.cellular_mbim_compliance b/test_suites/control.cellular_mbim_compliance
deleted file mode 100644
index 20d10f2..0000000
--- a/test_suites/control.cellular_mbim_compliance
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright (c) 2012 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "cellular_mbim_compliance"
-TIME = "SHORT"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "suite"
-TEST_TYPE = "server"
-
-DOC = """
-Run the MBIM compliance test suite on a given modem device
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
- 'components': ['OS>Systems>Mobile'],
- 'owner': 'benchan@chromium.org',
- 'status': None,
- 'summary': None,
- 'title': None,
- 'cc': ['benchan@chromium.org', 'ejcaruso@chromium.org']
-}
-
-args_dict['suite_dependencies'] = 'modem_repair'
-args_dict['max_runtime_mins'] = 20
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['name'] = 'cellular_mbim_compliance'
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.cellular_modem_repair b/test_suites/control.cellular_modem_repair
deleted file mode 100644
index 0485300..0000000
--- a/test_suites/control.cellular_modem_repair
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (c) 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.
-
-AUTHOR = "Harpreet Grewal <harpreet@chromium.org>"
-NAME = "cellular_modem_repair"
-TIME = "SHORT"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "suite"
-TEST_TYPE = "server"
-
-DOC = """
-Run stale modem reboot test to repair the stale modem.
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = 'cellular_modem_repair'
-args_dict['add_experimental'] = True
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
\ No newline at end of file
diff --git a/test_suites/control.cellular_ota b/test_suites/control.cellular_ota
deleted file mode 100644
index 8db7839..0000000
--- a/test_suites/control.cellular_ota
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright (c) 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "cellular_ota"
-TIME = "SHORT"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "suite"
-TEST_TYPE = "server"
-
-DOC = """
-Run automated 3g tests to ensure that 3g has not regressed.
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
- 'components': ['OS>Systems>Network>Cellular'],
- 'owner': 'benchan@chromium.org',
- 'status': None,
- 'summary': None,
- 'title': None,
- 'cc': ['benchan@chromium.org', 'ejcaruso@chromium.org']
-}
-
-args_dict['max_runtime_mins'] = 20
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['name'] = 'cellular_ota'
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
\ No newline at end of file
diff --git a/test_suites/control.cellular_ota_flaky b/test_suites/control.cellular_ota_flaky
deleted file mode 100644
index 61e02ca..0000000
--- a/test_suites/control.cellular_ota_flaky
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright (c) 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "cellular_ota_flaky"
-TIME = "SHORT"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "suite"
-TEST_TYPE = "server"
-
-DOC = """
-Run automated 3g tests to ensure that 3g has not regressed.
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
- 'components': ['OS>Systems>Network>Cellular'],
- 'owner': 'ejcaruso@chromium.org',
- 'status': None,
- 'summary': None,
- 'title': None,
-}
-
-args_dict['max_runtime_mins'] = 20
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['name'] = 'cellular_ota'
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.cellular_pseudomodem b/test_suites/control.cellular_pseudomodem
deleted file mode 100644
index 5ca6b61..0000000
--- a/test_suites/control.cellular_pseudomodem
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright (c) 2013 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "cellular_pseudomodem"
-PURPOSE = "Cellular tests that use a pseudomodem and are able to run in VMs"
-
-TIME = "SHORT"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-Run automated 3G and LTE tests on a pseudomodem to ensure that cellular
-functionality has not regressed.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
- 'components': ['OS>Systems>Mobile'],
- 'owner': 'benchan@chromium.org',
- 'status': None,
- 'summary': None,
- 'title': None,
- 'cc': ['benchan@chromium.org', 'ejcaruso@chromium.org']
-}
-
-args_dict['name'] = 'cellular_pseudomodem'
-args_dict['max_runtime_mins'] = 10
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.chameleon_audio_perbuild b/test_suites/control.chameleon_audio_perbuild
deleted file mode 100644
index cabdcad..0000000
--- a/test_suites/control.chameleon_audio_perbuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2015 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.
-
-AUTHOR = "chromeos-chameleon"
-NAME = "chameleon_audio_perbuild"
-PURPOSE = "A Chameleon audio test suite."
-
-TIME = "LENGTHY"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-Audio tests which require chameleon and audio boards connected.
-The Audio and Chameleon boards can emulate audio jack audio activity
-in order to test the Chrome OS audio stack.
-
-Together with DUT and external peripherals they are bundled in
-audio-box environment for end-to-end testing. Details on go/audioboard
-go/audiobox, go/ab-care-and-feed, and go/chameleon-audio-conf.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
- 'labels': ['OS-Chrome', 'Chameleon'],
- 'components': ['OS>Kernel>Audio'],
- 'owner': 'cychiang@chromium.org',
- 'status': None,
- 'summary': None,
- 'title': None,
- 'cc': ['kalin@chromium.org', 'conradlo@chromium.org',
- 'chromeos-audio-bugs@google.com']
-}
-
-args_dict['name'] = NAME
-args_dict['suite_dependencies'] = 'chameleon'
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['max_runtime_mins'] = 240
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.chameleon_audio_unstable b/test_suites/control.chameleon_audio_unstable
deleted file mode 100644
index 6ae3198..0000000
--- a/test_suites/control.chameleon_audio_unstable
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2015 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.
-
-AUTHOR = "chromeos-chameleon"
-NAME = "chameleon_audio_unstable"
-PURPOSE = "A Chameleon audio test suite."
-
-TIME = "LENGTHY"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-Audio tests which require chameleon and audio boards connected.
-The Audio and Chameleon boards can emulate audio jack audio activity
-in order to test the Chrome OS audio stack.
-
-Together with DUT and external peripherals they are bundled in
-audio-box environment for end-to-end testing. Details on go/audioboard
-go/audiobox, go/ab-care-and-feed, and go/chameleon-audio-conf.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
- 'labels': ['OS-Chrome', 'Chameleon'],
- 'components': ['OS>Kernel>Audio'],
- 'owner': 'cychiang@chromium.org',
- 'status': None,
- 'summary': None,
- 'title': None,
- 'cc': ['kalin@chromium.org', 'conradlo@chromium.org',
- 'chromeos-audio-bugs@google.com']
-}
-
-args_dict['name'] = NAME
-args_dict['suite_dependencies'] = 'chameleon'
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['max_runtime_mins'] = 240
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.chameleon_hdmi_perbuild b/test_suites/control.chameleon_hdmi_perbuild
deleted file mode 100644
index 6cdc03d..0000000
--- a/test_suites/control.chameleon_hdmi_perbuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright (c) 2015 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.
-
-AUTHOR = "chromeos-chameleon"
-NAME = "chameleon_hdmi_perbuild"
-PURPOSE = "A Chameleon test suite."
-
-TIME = "LENGTHY"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-Display tests which require Chameleon board connected via HDMI connection.
-The Chameleon board can emulate a monitor such that the test can control
-its behaviors in order to test the Chrome OS graphic stack.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
- 'labels': ['OS-Chrome', 'Chameleon'],
- 'components': ['OS>Kernel>Graphics'],
- 'owner': 'kalin@chromium.org',
- 'status': None,
- 'summary': None,
- 'title': None,
- 'cc': ['waihong@chromium.org', 'conradlo@chromium.org']
-}
-
-args_dict['suite_dependencies'] = 'chameleon:hdmi'
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 240
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.chameleon_hdmi_stress b/test_suites/control.chameleon_hdmi_stress
deleted file mode 100644
index ebd7317..0000000
--- a/test_suites/control.chameleon_hdmi_stress
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright (c) 2015 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.
-
-AUTHOR = "chromeos-chameleon"
-NAME = "chameleon_hdmi_stress"
-PURPOSE = "A Chameleon test stress suite."
-
-TIME = "LENGTHY"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-Display tests which require Chameleon board connected via HDMI connection.
-The Chameleon board can emulate a monitor such that the test can control
-its behaviors in order to test the Chrome OS graphic stack.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
- 'labels': ['OS-Chrome', 'Chameleon'],
- 'components': ['OS>Kernel>Graphics'],
- 'owner': 'kalin@chromium.org',
- 'status': None,
- 'summary': None,
- 'title': None,
- 'cc': ['waihong@chromium.org', 'conradlo@chromium.org']
-}
-
-args_dict['suite_dependencies'] = 'chameleon:hdmi'
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 240
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.chameleon_hdmi_unstable b/test_suites/control.chameleon_hdmi_unstable
deleted file mode 100644
index fed5c98..0000000
--- a/test_suites/control.chameleon_hdmi_unstable
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright (c) 2015 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.
-
-AUTHOR = "chromeos-chameleon"
-NAME = "chameleon_hdmi_unstable"
-PURPOSE = "A Chameleon test suite."
-
-TIME = "LENGTHY"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-Display tests which require Chameleon board connected via HDMI connection.
-The Chameleon board can emulate a monitor such that the test can control
-its behaviors in order to test the Chrome OS graphic stack.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
- 'labels': ['OS-Chrome', 'Chameleon'],
- 'components': ['OS>Kernel>Graphics'],
- 'owner': 'kalin@chromium.org',
- 'status': None,
- 'summary': None,
- 'title': None,
- 'cc': ['waihong@chromium.org', 'conradlo@chromium.org']
-}
-
-args_dict['suite_dependencies'] = 'chameleon:hdmi'
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 240
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.check_setup_cts_N b/test_suites/control.check_setup_cts_N
deleted file mode 100644
index 6ce8699..0000000
--- a/test_suites/control.check_setup_cts_N
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2017 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "check_setup_cts_N"
-PURPOSE = """
-Test moblab has correct DUT configuration for cts N suite
-"""
-
-TIME = "SHORT"
-TEST_CATEGORY = "Setup"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-Tests that moblab has the minimum number of DUTs, with correct labels. This
-test relieves the pain point of kicking off a long running test suite, but
-having a handful of tests fail, or not run at all because some the DUT setup
-wasn't correct.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.check_setup_storage_qual b/test_suites/control.check_setup_storage_qual
deleted file mode 100644
index 84e0a4b..0000000
--- a/test_suites/control.check_setup_storage_qual
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2017 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "check_setup_storage_qual"
-PURPOSE = """
-Test moblab has correct DUT configuration for storage qual suite
-"""
-
-TIME = "SHORT"
-TEST_CATEGORY = "Setup"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-Tests that moblab has the minimum number of DUTs, with correct labels. This
-test relieves the pain point of kicking off a long running test suite, but
-having a handful of tests fail, or not run at all because some the DUT setup
-wasn't correct.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.chrome-informational b/test_suites/control.chrome-informational
deleted file mode 100644
index a6901bd..0000000
--- a/test_suites/control.chrome-informational
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2017 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "chrome-informational"
-PURPOSE = "Informational tests of chrome"
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite contains informational tests that:
-
-* Test Chrome, not Chrome OS
-* Require real hardware (for example, to test GPU process init
-or display management)
-* Should not block uprev of Chrome into Chrome OS
-
-Chrome tests that do not require real hardware should be
-implemented in the Chrome repository as unit_tests or browser_tests.
-
-Tests in this suite are usually for experimental projects being
-implemented behind a flag. Once the Chrome code stabilizes and
-the flag is on-by-default the tests should be moved to bvt-cq
-to block Chrome uprev if they fail.
-
-Tests in this suite must be SHORT and should not require any
-special lab resources.
-
-@param build: The name of the image to test.
- Ex: veyron_minnie-release/R60-9575.0.0
-@param board: The board to test on. Ex: veyron_minnie
-@param pool: The pool of machines to utilize for scheduling.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-
-args_dict['max_runtime_mins'] = 15
-args_dict['name'] = 'chrome-informational'
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.cr50_stress b/test_suites/control.cr50_stress
deleted file mode 100644
index 6d29c7c..0000000
--- a/test_suites/control.cr50_stress
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright (c) 2017 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "cr50_stress"
-PURPOSE = "Cr50 stress test functionality and devices"
-
-TIME = "LONG"
-TEST_CATEGORY = "Stress"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the cr50_stress test suite.
-
-This suite is meant to cover the full gamut of stress long running cr50 stress
-tests. Other stress related suites will focus on more specific aspects, which
-can be run as diagnosis tools.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = 'cr50_stress'
-args_dict['add_experimental'] = False
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.cros-av-analysis b/test_suites/control.cros-av-analysis
deleted file mode 100644
index 4bc59d9..0000000
--- a/test_suites/control.cros-av-analysis
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2019 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.
-
-AUTHOR = "vsuley"
-NAME = "cros-av-analysis"
-PURPOSE = "To run AV Analysis tests for ChromeOS lab DUTs."
-
-TIME = "LONG"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-Run tests that need a fairly specialized setup to play, capture video and upload
-to cloud for further analysis. These tests run for a long time and their
-resulting metrics are generated asynchronously after processing whatever uploads
-are ahead in the queue.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 60
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.cros_test_platform b/test_suites/control.cros_test_platform
deleted file mode 100644
index 8938ca0..0000000
--- a/test_suites/control.cros_test_platform
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2019 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.
-
-AUTHOR = "Chrome OS Test Platform Team"
-NAME = "cros_test_platform"
-PURPOSE = "Entry point for cros_test_platform execution of autotest tests."
-
-DOC = """
-This suite is used as an entry point for cros_test_platform, to allow it to
-inject arbitrary arguments into dynamic_suite.reimage_and_run, by
-supplying these arguments as a json-encoded args dictionary (with name
-args_dict_json).
-
-This suite should not be used for any other purpose.
-"""
-
-import json
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-# Load and overwrite args_dict.
-args_dict_json = args_dict['args_dict_json']
-args_dict.update(dynamic_suite.byteify(json.loads(args_dict_json)))
-
-# Inject handle to current job instance.
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.crosbolt_perf_nightly b/test_suites/control.crosbolt_perf_nightly
deleted file mode 100644
index 8ba8c9a..0000000
--- a/test_suites/control.crosbolt_perf_nightly
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2015 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.
-
-AUTHOR = "rohitbm@chromium.org, chromeos-performance@google.com"
-NAME = "crosbolt_perf_nightly"
-PURPOSE = "Performance tests"
-
-TIME = "LONG"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-ChromeOS performance tests including telemetry tests.
-
-If a test takes too long, consider putting it in the crosbolt_perf_weekly
-suite.
-
-@param build: The name of the image to test.
- E.g. x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. E.g. x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to its defaults.
-_BUG_TEMPLATE = {
- 'labels': ['Type-Bug', 'Cros-Perf-Test'],
- 'owner': 'rohitbm@chromium.org',
- 'cc': ['lafeenstra@chromium.org']
-}
-
-args_dict['max_runtime_mins'] = 1440
-args_dict['timeout_mins'] = 2880
-args_dict['name'] = 'crosbolt_perf_nightly'
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.crosbolt_perf_parallels_nightly b/test_suites/control.crosbolt_perf_parallels_nightly
deleted file mode 100644
index 8f705e4..0000000
--- a/test_suites/control.crosbolt_perf_parallels_nightly
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "meiring@google.com, cros-parallels@google.com"
-NAME = "crosbolt_perf_parallels_nightly"
-PURPOSE = "Runs nightly Parallels performance tests."
-
-TIME = "LONG"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-ChromeOS performance tests for Parallels.
-
-If a test takes too long, consider putting it in the
-crosbolt_perf_parallels_weekly suite.
-
-@param build: The name of the image to test.
- E.g. x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. E.g. x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to its defaults.
-_BUG_TEMPLATE = {
- 'labels': ['Type-Bug', 'Cros-Perf-Test'],
- 'owner': 'rohitbm@chromium.org',
- 'cc': ['lafeenstra@chromium.org']
-}
-
-args_dict['max_runtime_mins'] = 1440
-args_dict['timeout_mins'] = 2880
-args_dict['name'] = NAME
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.crosbolt_perf_parallels_perbuild b/test_suites/control.crosbolt_perf_parallels_perbuild
deleted file mode 100644
index 5959107..0000000
--- a/test_suites/control.crosbolt_perf_parallels_perbuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "meiring@google.com, cros-parallels@google.com"
-NAME = "crosbolt_perf_parallels_perbuild"
-PURPOSE = "Runs per-build Parallels performance tests."
-
-TIME = "LONG"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-ChromeOS performance tests for Parallels.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to its defaults.
-_BUG_TEMPLATE = {
- 'labels': ['Type-Bug', 'Cros-Perf-Test'],
- 'owner': 'rohitbm@chromium.org',
- 'cc': []
-}
-
-args_dict['max_runtime_mins'] = 960
-args_dict['timeout_mins'] = 1440
-args_dict['file_bugs'] = False
-args_dict['name'] = NAME
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.crosbolt_perf_parallels_weekly b/test_suites/control.crosbolt_perf_parallels_weekly
deleted file mode 100644
index 99a1d08..0000000
--- a/test_suites/control.crosbolt_perf_parallels_weekly
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "meiring@google.com, cros-parallels@google.com"
-NAME = "crosbolt_perf_parallels_weekly"
-PURPOSE = "Runs weekly Parallels performance tests."
-
-TIME = "MEDIUM"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-ChromeOS performance tests for Parallels.
-
-A test should be considered living in crosbolt_perf_nightly first unless the
-test takes too long to run daily.
-
-@param build: The name of the image to test.
- E.g. x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. E.g. x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to its defaults.
-_BUG_TEMPLATE = {
- 'labels': ['Type-Bug', 'Cros-Perf-Test'],
- 'owner': 'bccheng@chromium.org',
- 'cc': ['conradlo@chromium.org']
-}
-
-args_dict['max_runtime_mins'] = 1440
-args_dict['timeout_mins'] = 4320
-args_dict['name'] = NAME
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.crosbolt_perf_perbuild b/test_suites/control.crosbolt_perf_perbuild
deleted file mode 100644
index 64fe9ee..0000000
--- a/test_suites/control.crosbolt_perf_perbuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2014 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.
-
-AUTHOR = "rohitbm@chromium.org, chromeos-performance@google.com"
-NAME = "crosbolt_perf_perbuild"
-PURPOSE = "Performance tests"
-
-TIME = "LONG"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-ChromeOS performance tests including telemetry tests.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to its defaults.
-_BUG_TEMPLATE = {
- 'labels': ['Type-Bug', 'Cros-Perf-Test'],
- 'owner': 'rohitbm@chromium.org',
- 'cc': []
-}
-
-args_dict['max_runtime_mins'] = 960
-args_dict['timeout_mins'] = 1440
-args_dict['file_bugs'] = False
-args_dict['name'] = 'crosbolt_perf_perbuild'
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.crosbolt_perf_weekly b/test_suites/control.crosbolt_perf_weekly
deleted file mode 100644
index 8997fe0..0000000
--- a/test_suites/control.crosbolt_perf_weekly
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2017 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.
-
-AUTHOR = "littlecvr@chromium.org, chromeos-performance@google.com"
-NAME = "crosbolt_perf_weekly"
-PURPOSE = "Performance tests that should be run once a week"
-
-TIME = "MEDIUM"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-ChromeOS performance tests including telemetry tests.
-
-A test should be considered living in crosbolt_perf_nightly first unless the
-test takes too long to run daily.
-
-@param build: The name of the image to test.
- E.g. x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. E.g. x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to its defaults.
-_BUG_TEMPLATE = {
- 'labels': ['Type-Bug', 'Cros-Perf-Test'],
- 'owner': 'bccheng@chromium.org',
- 'cc': ['conradlo@chromium.org']
-}
-
-args_dict['max_runtime_mins'] = 1440
-args_dict['timeout_mins'] = 4320
-args_dict['name'] = 'crosbolt_perf_weekly'
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.cts b/test_suites/control.cts
deleted file mode 100644
index 589ab20..0000000
--- a/test_suites/control.cts
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2018 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.
-
-AUTHOR = "wangmichael@chromium.org"
-NAME = "cts"
-PURPOSE = "Special suite for final CTS qualification of ARC++ on stable."
-CRITERIA = "All tests with SUITE=cts must pass."
-
-TIME = "LONG"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-ChromeOS ARC++ tests.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-
-def predicate(test):
- if not hasattr(test, 'suite') or not hasattr(test, 'name'):
- return False
- if not NAME in test.suite.split(','):
- return False
- # Strip off the cheets_CTS. from the test name before comparing to args
- name = test.name[test.name.find('.') + 1:]
- if 'tests' in args_dict and name not in args_dict['tests']:
- return False
- return True
-
-args_dict['name'] = NAME
-args_dict['job'] = job
-args_dict['file_bugs'] = False
-args_dict['max_runtime_mins'] = 10080
-args_dict['timeout_mins'] = 10080
-args_dict['add_experimental'] = True
-args_dict['predicate'] = predicate
-dynamic_suite.reimage_and_run(**args_dict)
-
diff --git a/test_suites/control.cts_N b/test_suites/control.cts_N
deleted file mode 100644
index d753ae8..0000000
--- a/test_suites/control.cts_N
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2016 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.
-
-AUTHOR = "ihf@chromium.org"
-NAME = "cts_N"
-PURPOSE = "Special suite for final CTS qualification of ARC++ on stable."
-CRITERIA = "All tests with SUITE=cts_N must pass."
-
-TIME = "LONG"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-ChromeOS ARC++ tests.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-
-def predicate(test):
- if not hasattr(test, 'suite') or not hasattr(test, 'name'):
- return False
- if not test.suite == NAME:
- return False
- # Strip off the cheets_CTS_N. from the test name before comparing to args
- name = test.name[test.name.find('.') + 1:]
- if 'tests' in args_dict and name not in args_dict['tests']:
- return False
- return True
-
-args_dict['name'] = NAME
-args_dict['job'] = job
-args_dict['file_bugs'] = False
-args_dict['max_runtime_mins'] = 5040 # 5040 min = 3.5 days
-args_dict['timeout_mins'] = 5040 # Bump default 1 day to half a week as well.
-args_dict['add_experimental'] = True
-args_dict['predicate'] = predicate
-dynamic_suite.reimage_and_run(**args_dict)
-
diff --git a/test_suites/control.cts_P b/test_suites/control.cts_P
deleted file mode 100644
index 46f0916..0000000
--- a/test_suites/control.cts_P
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2018 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.
-
-AUTHOR = "ihf@chromium.org"
-NAME = "cts_P"
-PURPOSE = "Special suite for final CTS qualification of ARC++ on stable."
-CRITERIA = "All tests with SUITE=cts_P must pass."
-
-TIME = "LONG"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-ChromeOS ARC++ tests.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-
-def predicate(test):
- if not hasattr(test, 'suite') or not hasattr(test, 'name'):
- return False
- if not NAME in test.suite.split(','):
- return False
- # Strip off the cheets_CTS_P. from the test name before comparing to args
- name = test.name[test.name.find('.') + 1:]
- if 'tests' in args_dict and name not in args_dict['tests']:
- return False
- return True
-
-args_dict['name'] = NAME
-args_dict['job'] = job
-args_dict['file_bugs'] = False
-args_dict['max_runtime_mins'] = 10080
-args_dict['timeout_mins'] = 10080
-args_dict['add_experimental'] = True
-args_dict['predicate'] = predicate
-dynamic_suite.reimage_and_run(**args_dict)
-
diff --git a/test_suites/control.cups_weekly b/test_suites/control.cups_weekly
deleted file mode 100644
index 4c82a5f..0000000
--- a/test_suites/control.cups_weekly
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2018 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.
-
-AUTHOR = "project-bolton"
-NAME = "cups_weekly"
-PURPOSE = "A weekly test suite for PPD validation."
-
-TIME = "LENGTHY"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-PPD validation is part of CUPS printing routines to verify CUPS correctly
-interprets the PPD files set.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-
-args_dict['name'] = NAME
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.debug_kernel_testing b/test_suites/control.debug_kernel_testing
deleted file mode 100644
index 44a9df6..0000000
--- a/test_suites/control.debug_kernel_testing
+++ /dev/null
@@ -1,27 +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.
-
-AUTHOR = "mwiitala, Chrome OS Kernel Team"
-NAME = "debug_kernel_testing"
-PURPOSE = "Suite to run Syzkaller tests on Chrome OS devices."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite is intended to run miscellaneous tests for
-go/cros-automated-debug-kernel-testing. Other test suites run for
-debug kernel testing (DKT) as well, but this suite allows tests to be
-added to the set without adding an entire suite.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.deqp b/test_suites/control.deqp
deleted file mode 100644
index 0cd0856..0000000
--- a/test_suites/control.deqp
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2016 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.
-
-AUTHOR = "ihf@chromium.org"
-NAME = "deqp"
-PURPOSE = "Special suite for specifically running dEQP on ChromeOS"
-CRITERIA = "All tests with SUITE=deqp must pass."
-
-TIME = "LONG"
-TEST_CATEGORY = "Graphics"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-ChromeOS ARC++ tests.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros import provision
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to its defaults.
-_BUG_TEMPLATE = {
- 'labels': ['Type-Bug'],
- 'owner': 'ihf@chromium.org'
-}
-
-HOURS = 60 # minutes in an hour
-DAYS = 24 * HOURS # minutes in a day
-# A bit longer than the longest running job in the suite.
-args_dict['max_runtime_mins'] = 1.5 * DAYS
-# Accept result delays for this suite due to temporary lab overload.
-args_dict['timeout_mins'] = 3 * DAYS
-
-args_dict['name'] = NAME
-args_dict['file_bugs'] = False
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
\ No newline at end of file
diff --git a/test_suites/control.dev_drone_image_test b/test_suites/control.dev_drone_image_test
deleted file mode 100644
index 79972a6..0000000
--- a/test_suites/control.dev_drone_image_test
+++ /dev/null
@@ -1,25 +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.
-
-AUTHOR = "Chrome Fleet Software"
-NAME = "dev_drone_image_test"
-PURPOSE = "Test Skylab drone image in dev environment before pushing to canary environment."
-
-TIME = "LONG"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite is designed to test skylab drone in Skylab.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.drivefs-cq b/test_suites/control.drivefs-cq
deleted file mode 100644
index 060a8d4..0000000
--- a/test_suites/control.drivefs-cq
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "chromeos-files-syd@google.com"
-NAME = "drivefs-cq"
-PURPOSE = "Suite to verify DriveFS functionality to ensure successful uprev"
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite verifies all of Chrome OS's basic functionality using tests
-which have a tast group attribute of drivefs-cq. These tests should run
-as presubmit only when a new ebuild is uprevved in the drivefs and
-drivefs-ipc packages.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 20
-args_dict['timeout_mins'] = 1440
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.dummy b/test_suites/control.dummy
deleted file mode 100644
index 689adbf..0000000
--- a/test_suites/control.dummy
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (c) 2012 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "dummy"
-PURPOSE = "To be run while testing the infrastructure and test harness."
-
-TIME = "SHORT"
-TEST_CATEGORY = "Dummy"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is a dummy test suite. It runs dummy tests that always pass or always fail
-so that we can test result gathering and reporting mechanisms.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['name'] = 'dummy'
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.dummy_server b/test_suites/control.dummy_server
deleted file mode 100644
index 5f8cc71..0000000
--- a/test_suites/control.dummy_server
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2015 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "dummy_server"
-PURPOSE = "To be run while testing the infrastructure and test harness."
-
-TIME = "SHORT"
-TEST_CATEGORY = "Dummy"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is a dummy test suite. It runs dummy server side tests that always pass.
-so that we can test result gathering and reporting mechanisms.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.dummy_server_nossp b/test_suites/control.dummy_server_nossp
deleted file mode 100644
index fdb1ead..0000000
--- a/test_suites/control.dummy_server_nossp
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2017 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "dummy_server_nossp"
-PURPOSE = "To be run while testing the infrastructure and test harness."
-
-TIME = "SHORT"
-TEST_CATEGORY = "Dummy"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is a dummy test suite. It runs dummy server side tests that always pass.
-so that we can test result gathering and reporting mechanisms.
-
-This is a minimal infrastructre integration test. By running this suite, you
-test:
-- suite support
-- server side test support
-- client side test support
-
-You do not test:
-- SSP support
-- various kinds of hosts
-- test write framekwork libraries like xmlrpc_server
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.dummyflake b/test_suites/control.dummyflake
deleted file mode 100644
index b149d76..0000000
--- a/test_suites/control.dummyflake
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright (c) 2012 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "dummyflake"
-PURPOSE = "Test basic, required functionality."
-
-TIME = "SHORT"
-TEST_CATEGORY = "Dummy"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is a suite for testing autotest's handling of RETRIES of flaky tests.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['name'] = 'dummyflake'
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.enroll_retainment b/test_suites/control.enroll_retainment
deleted file mode 100644
index 79f2094..0000000
--- a/test_suites/control.enroll_retainment
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright (c) 2019 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.
-
-AUTHOR = "Ruben Zakarian <rzakarian@chromium.org>"
-NAME = "enroll_retainment"
-PURPOSE = "Suite for automated enroll retainment tests."
-
-TIME = "LONG"
-TEST_CATEGORY = "General"
-TEST_CLASS = "enterprise"
-TEST_TYPE = "server"
-
-DOC = """
-This suite runs the enroll retainment test on a device in the lab.
-
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
- 'labels': ['enroll_retainment'],
- 'owner': '',
- 'status': None,
- 'summary': None,
- 'title': None,
- 'cc': ['chromeos-ent-test@google.com']
-}
-
-args_dict['name'] = NAME
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
\ No newline at end of file
diff --git a/test_suites/control.enrollment_per-build b/test_suites/control.enrollment_per-build
deleted file mode 100644
index 636cb2f..0000000
--- a/test_suites/control.enrollment_per-build
+++ /dev/null
@@ -1,37 +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.
-
-AUTHOR = "enterprise-policy-support-rotation"
-NAME = "enrollment_per-build"
-PURPOSE = "Enrollment tests"
-
-TIME = "LONG"
-TEST_CATEGORY = "Enrollment"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the part of the enrollment test suite which should run once per build.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['max_runtime_mins'] = 960
-args_dict['timeout_mins'] = 1440
-args_dict['file_bugs'] = False
-args_dict['name'] = 'enrollment_per-build'
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.ent-nightly b/test_suites/control.ent-nightly
deleted file mode 100644
index 94a4832..0000000
--- a/test_suites/control.ent-nightly
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2018 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.
-
-AUTHOR = "Katherine Threlkeld <kathrelkeld@chromium.org>"
-NAME = "ent-nightly"
-PURPOSE = "Lower priority Enterprise related tests."
-TIME = "SHORT"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite runs Enterprise tests which should run on nightly, across
-a subset of boards.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = 'ent-nightly'
-args_dict['add_experimental'] = True
-args_dict['max_runtime_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.ent-perbuild b/test_suites/control.ent-perbuild
deleted file mode 100644
index cf9d2ee..0000000
--- a/test_suites/control.ent-perbuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2018 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.
-
-AUTHOR = "Katherine Threlkeld <kathrelkeld@chromium.org>"
-NAME = "ent-perbuild"
-PURPOSE = "High priority Enterprise related tests."
-TIME = "SHORT"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite runs Enterprise tests which should run on every build, across
-a subset of boards.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = 'ent-perbuild'
-args_dict['add_experimental'] = True
-args_dict['max_runtime_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.ent-wificell b/test_suites/control.ent-wificell
deleted file mode 100644
index 49840a2..0000000
--- a/test_suites/control.ent-wificell
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2018 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.
-
-AUTHOR = "Max Timkovich <timkovich@chromium.org>"
-NAME = "ent-wificell"
-PURPOSE = "Enterprise tests that rely on wificells"
-TIME = "SHORT"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite runs Enterprise tests that require wificells. This suite runs
-nightly, across a subset of boards.
-"""
-
-import common
-from autotest_lib.server.cros import provision
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = 'ent-wificell'
-args_dict['add_experimental'] = True
-args_dict['max_runtime_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.experimental b/test_suites/control.experimental
deleted file mode 100644
index b418426..0000000
--- a/test_suites/control.experimental
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright (c) 2014 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "experimental"
-PURPOSE = "Staging ground for BVT candidates"
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-Before a test is added to the BVT, it must demonstrate a track
-record of stability running in the lab. The track record is
-created by adding it to a suite and allowing it to run. The
-'experimental' suite can be used when no other more convenient
-suite is available for the purpose.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-
-args_dict['add_experimental'] = False
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.faft_bios b/test_suites/control.faft_bios
deleted file mode 100644
index 9f5e0c5..0000000
--- a/test_suites/control.faft_bios
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright (c) 2012 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "faft_bios"
-PURPOSE = "Test hard-to-automate firmware scenarios."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-
-This is a faft (FULLY AUTOMATED FIRMWARE TEST) suite.
-The tests verfiy that valid boot scenarios progress properly (with state
-progress checks) and that error scenarios (corrupted blobs) are caught as
-expected. Some of these test failures should close the tree as they may imply
-that the system is unbootable and further tests will only become hung or
-blocked. Other tests verify all of the features (some of them security
-related) are functioning.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
- 'labels': ['FW-labblocker', 'Restrict-View-Google'],
- 'owner': '',
- 'status': None,
- 'summary': None,
- 'title': None,
-}
-
-args_dict['file_bugs'] = False
-args_dict['name'] = 'faft_bios'
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.faft_bios_ec3po b/test_suites/control.faft_bios_ec3po
deleted file mode 100644
index f9fc688..0000000
--- a/test_suites/control.faft_bios_ec3po
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2016 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "faft_bios_ec3po"
-PURPOSE = "Test hard-to-automate firmware scenarios using EC-3PO changes."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the same suite as faft_bios, but instead uses the EC-3PO console
-interpreter inside of servod. This suite should be removed when satisfied with
-the results.
-
-This is a faft (FULLY AUTOMATED FIRMWARE TEST) suite.
-The tests verfiy that valid boot scenarios progress properly (with state
-progress checks) and that error scenarios (corrupted blobs) are caught as
-expected. Some of these test failures should close the tree as they may imply
-that the system is unbootable and further tests will only become hung or
-blocked. Other tests verify all of the features (some of them security
-related) are functioning.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
- 'labels': ['FW-labblocker', 'Restrict-View-Google'],
- 'owner': 'aaboagye@chromium.org',
- 'status': None,
- 'summary': None,
- 'title': None,
-}
-
-args_dict['file_bugs'] = True
-args_dict['name'] = 'faft_bios_ec3po'
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.faft_bios_ro_qual b/test_suites/control.faft_bios_ro_qual
deleted file mode 100644
index 9708d25..0000000
--- a/test_suites/control.faft_bios_ro_qual
+++ /dev/null
@@ -1,26 +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.
-
-AUTHOR = "philipchen"
-NAME = "faft_bios_ro_qual"
-PURPOSE = "Qualify the AP firmware for RO+RW release"
-
-TIME = "LONG"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This test suite verifies if the AP firmware is ready for RO+RW production
-release.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = 'faft_bios_ro_qual'
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.faft_bios_rw_qual b/test_suites/control.faft_bios_rw_qual
deleted file mode 100644
index 1b51f9b..0000000
--- a/test_suites/control.faft_bios_rw_qual
+++ /dev/null
@@ -1,25 +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.
-
-AUTHOR = "philipchen"
-NAME = "faft_bios_rw_qual"
-PURPOSE = "Qualify the AP firmware for RW-only release"
-
-TIME = "LONG"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This test suite verifies if the AP firmware is ready for RW production release.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = 'faft_bios_rw_qual'
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.faft_bios_tot b/test_suites/control.faft_bios_tot
deleted file mode 100644
index 6776143..0000000
--- a/test_suites/control.faft_bios_tot
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright (c) 2016 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "faft_bios_tot"
-PURPOSE = "Test hard-to-automate firmware scenarios on Tot."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite runs the same tests as faft_bios, but using the firmware images from
-Tot instead of from the firmware branches.
-
-This is a faft (FULLY AUTOMATED FIRMWARE TEST) suite.
-The tests verfiy that valid boot scenarios progress properly (with state
-progress checks) and that error scenarios (corrupted blobs) are caught as
-expected. Some of these test failures should close the tree as they may imply
-that the system is unbootable and further tests will only become hung or
-blocked. Other tests verify all of the features (some of them security
-related) are functioning.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
- 'labels': ['FW-labblocker', 'Restrict-View-Google'],
- 'owner': '',
- 'status': None,
- 'summary': None,
- 'title': None,
-}
-
-args_dict['file_bugs'] = False
-args_dict['name'] = 'faft_bios_tot'
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.faft_ccd b/test_suites/control.faft_ccd
deleted file mode 100644
index 952dc65..0000000
--- a/test_suites/control.faft_ccd
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "faft_ccd"
-PURPOSE = "Test suite to verify basic ccd functionality."
-
-TIME = "SHORT"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the faft_ccd test suite.
-
-This will verify CCD functionality.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = 'faft_ccd'
-args_dict['add_experimental'] = True
-args_dict['job'] = job
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.faft_cr50_crypto b/test_suites/control.faft_cr50_crypto
deleted file mode 100644
index ad9d59f..0000000
--- a/test_suites/control.faft_cr50_crypto
+++ /dev/null
@@ -1,35 +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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "faft_cr50_crypto"
-PURPOSE = "Experimental verify cr50 crypto."
-
-TIME = "SHORT"
-TEST_CATEGORY = "Stress"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the faft_cr50_crypto test suite.
-
-This will verify cr50 crypto before images are released to ChromeOS.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['suite_dependencies'] = 'cr50-ro-keyid:dev'
-args_dict['name'] = 'faft_cr50_crypto'
-args_dict['add_experimental'] = True
-args_dict['job'] = job
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.faft_cr50_experimental b/test_suites/control.faft_cr50_experimental
deleted file mode 100644
index 6e0a859..0000000
--- a/test_suites/control.faft_cr50_experimental
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright (c) 2017 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "faft_cr50_experimental"
-PURPOSE = "Experimental suite to test cr50 stress tests."
-
-TIME = "LONG"
-TEST_CATEGORY = "Stress"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the faft_cr50_experimental test suite.
-
-This suite is meant to be a proving ground for cr50 stress tests before they
-are promoted to the actual cr50 stress suite.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = 'faft_cr50_experimental'
-args_dict['add_experimental'] = True
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.faft_cr50_prepvt b/test_suites/control.faft_cr50_prepvt
deleted file mode 100644
index cb1d016..0000000
--- a/test_suites/control.faft_cr50_prepvt
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2018 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "faft_cr50_prepvt"
-PURPOSE = "Suite to test cr50 prePVT images."
-
-TIME = "LONG"
-TEST_CATEGORY = "Stress"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the faft_cr50_prepvt test suite.
-
-This will verify cr50 prePVT images before they are released to ChromeOS. After
-the prePVT released and verified, we will update the PVT image to include the
-new changes.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['suite_dependencies'] = 'cr50:prepvt'
-args_dict['name'] = 'faft_cr50_prepvt'
-args_dict['add_experimental'] = True
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.faft_cr50_pvt b/test_suites/control.faft_cr50_pvt
deleted file mode 100644
index 151029d..0000000
--- a/test_suites/control.faft_cr50_pvt
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2018 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "faft_cr50_pvt"
-PURPOSE = "Experimental suite to test cr50 stress tests."
-
-TIME = "LONG"
-TEST_CATEGORY = "Stress"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the faft_cr50_pvt test suite.
-
-This will verify cr50 PVT images before they are released to ChromeOS.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['suite_dependencies'] = 'cr50:pvt'
-args_dict['name'] = 'faft_cr50_pvt'
-args_dict['add_experimental'] = True
-args_dict['job'] = job
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.faft_cr50_tot b/test_suites/control.faft_cr50_tot
deleted file mode 100644
index 73e6fc5..0000000
--- a/test_suites/control.faft_cr50_tot
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2019 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "faft_cr50_tot"
-PURPOSE = "Suite to test TOT cr50 images."
-
-TIME = "LONG"
-TEST_CATEGORY = "Stress"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the faft_cr50_tot test suite.
-
-It is used to run tests nightly with TOT. It is used to catch bugs before images
-are prod signed. It can be used to verify mp or prePVT images before signing,
-but test args should be updated to reflect what is being verified.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = 'faft_cr50_tot'
-args_dict['add_experimental'] = True
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.faft_dev b/test_suites/control.faft_dev
deleted file mode 100644
index 3b1d4b5..0000000
--- a/test_suites/control.faft_dev
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright (c) 2012 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "faft_dev"
-PURPOSE = "Test hard-to-automate firmware and ec scenarios."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is a faft (FULLY AUTOMATED FIRMWARE TEST) suite. The tests in this suite
-operate on the DUT in 'dev' mode, where verified boot is not fully enforced.
-The tests verfiy that valid boot scenarios progress properly (with state
-progress checks) and that error scenarios (corrupted blobs) are caught as
-expected. Some of these test failures should close the tree as they may imply
-that the system is unbootable and further tests will only become hung or
-blocked. Other tests verify all of the features (some of them security
-related) are functioning.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['job'] = job
-args_dict['name'] = 'faft_dev'
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.faft_ec b/test_suites/control.faft_ec
deleted file mode 100644
index 9800e56..0000000
--- a/test_suites/control.faft_ec
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright (c) 2012 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "faft_ec"
-PURPOSE = "Test hard-to-automate firmware and ec scenarios."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is a faft (FULLY AUTOMATED FIRMWARE TEST) suite. The tests in this suite
-verify the Chrome OS EC operation, that valid boot scenarios progress properly
-(with state progress checks) and that error scenarios (corrupted blobs) are
-caught as expected. Some of these test failures should close the tree as they
-may imply that the system is unbootable and further tests will only become
-hung or blocked. Other tests verify all of the features (some of them security
-related) are functioning.
-
-Tests in the faft_ec suite are suitable for bring-up scenarios. Tests which
-are for production machines only should go in suite:faft_ec_fw_qual instead.
-However, all tests in this suite should also be in suite:faft_ec_fw_qual
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
- 'labels': ['FW-labblocker', 'Restrict-View-Google'],
- 'owner': '',
- 'status': None,
- 'summary': None,
- 'title': None,
-}
-
-args_dict['file_bugs'] = False
-args_dict['name'] = 'faft_ec'
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.faft_ec3po b/test_suites/control.faft_ec3po
deleted file mode 100644
index deed311..0000000
--- a/test_suites/control.faft_ec3po
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2016 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "faft_ec3po"
-PURPOSE = "Test hard-to-automate firmware and ec scenarios using EC-3PO."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the same suite as faft_ec, but instead uses the EC-3PO console
-interpreter inside of servod. This suite should be removed when satisfied with
-the results.
-
-This is a faft (FULLY AUTOMATED FIRMWARE TEST) suite. The tests in this suite
-verify the Chrome OS EC operation, that valid boot scenarios progress properly
-(with state progress checks) and that error scenarios (corrupted blobs) are
-caught as expected. Some of these test failures should close the tree as they
-may imply that the system is unbootable and further tests will only become
-hung or blocked. Other tests verify all of the features (some of them security
-related) are functioning.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
- 'labels': ['FW-labblocker', 'Restrict-View-Google'],
- 'owner': 'aaboagye@chromium.org',
- 'status': None,
- 'summary': None,
- 'title': None,
-}
-
-args_dict['file_bugs'] = True
-args_dict['name'] = 'faft_ec3po'
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.faft_ec_fw_qual b/test_suites/control.faft_ec_fw_qual
deleted file mode 100644
index 6c96848..0000000
--- a/test_suites/control.faft_ec_fw_qual
+++ /dev/null
@@ -1,29 +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.
-
-AUTHOR = "yllin"
-NAME = "faft_ec_fw_qual"
-PURPOSE = "Qualify the EC firmware for RW or RO+RW release"
-
-TIME = "LONG"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This test suite verifies if the EC firmware is ready for production
-release.
-
-Tests intended for both production release and bring-up should be in
-both suite:faft_ec and suite:faft_ec_fw_qual.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = 'faft_ec_fw_qual'
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.faft_ec_tot b/test_suites/control.faft_ec_tot
deleted file mode 100644
index 410c658..0000000
--- a/test_suites/control.faft_ec_tot
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright (c) 2012 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "faft_ec_tot"
-PURPOSE = "Test hard-to-automate firmware and ec scenarios on Tot."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite runs the same tests as faft_ec, but using the firmware images from
-Tot instead of from the firmware branches.
-
-This is a faft (FULLY AUTOMATED FIRMWARE TEST) suite. The tests in this suite
-verify the Chrome OS EC operation, that valid boot scenarios progress properly
-(with state progress checks) and that error scenarios (corrupted blobs) are
-caught as expected. Some of these test failures should close the tree as they
-may imply that the system is unbootable and further tests will only become
-hung or blocked. Other tests verify all of the features (some of them security
-related) are functioning.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
- 'labels': ['FW-labblocker', 'Restrict-View-Google'],
- 'owner': '',
- 'status': None,
- 'summary': None,
- 'title': None,
-}
-
-args_dict['file_bugs'] = False
-args_dict['name'] = 'faft_ec_tot'
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.faft_experimental b/test_suites/control.faft_experimental
deleted file mode 100644
index 55d35a1..0000000
--- a/test_suites/control.faft_experimental
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright (c) 2019 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "faft_experimental"
-PURPOSE = "Experimental suite to test faft_bios and faft_ec."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the faft_experimental test suite, for AP (BIOS) and EC firmware.
-
-This suite is meant to be a proving ground for AP/EC firmware tests before they
-are promoted to the actual faft_bios / faft_ec suites. Flaky tests should also
-be moved here while they're being worked on.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = 'faft_experimental'
-args_dict['add_experimental'] = True
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.faft_flashrom b/test_suites/control.faft_flashrom
deleted file mode 100644
index 24106c0..0000000
--- a/test_suites/control.faft_flashrom
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2016 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "faft_flashrom"
-PURPOSE = "Test flashrom and chromeos-firmwareupdate"
-
-TIME = "LONG"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the kernel_usb test suite.
-
-This suite is meant to cover set of boards with different board-families,
-and exercise flashrom and chromeos-firmwareupdate script.
-
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-_BUG_TEMPLATE = {
- 'labels': ['OS-Chrome', 'OS>Firmware', 'Flashrom'],
- 'owner': '',
- 'cc': ['kalin@google.com',
- 'dchan@chromium.org']
-}
-
-
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-args_dict['name'] = 'faft_flashrom'
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.faft_lab b/test_suites/control.faft_lab
deleted file mode 100644
index e1bfad6..0000000
--- a/test_suites/control.faft_lab
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright (c) 2013 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.
-
-AUTHOR = "mohsinally"
-NAME = "faft_lab"
-TIME = "MEDIUM"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-FAFT in the lab suite.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
- 'labels': ['FW-labblocker', 'Restrict-View-Google'],
- 'owner': '',
- 'status': None,
- 'summary': None,
- 'title': None,
- 'cc': ['mohsinally@google.com',
- 'beeps@chromium.org']
-}
-
-args_dict['file_bugs'] = True
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['name'] = NAME
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.faft_lv1 b/test_suites/control.faft_lv1
deleted file mode 100644
index 942a397..0000000
--- a/test_suites/control.faft_lv1
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright (c) 2012 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "faft_lv1"
-PURPOSE = "Test hard-to-automate 'normal' mode firmware scenarios."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-
-This test suite runs FAFT (Fully Automated Firmware Test) for BIOS that should
-all pass and that verifies the BIOS fit Chrome OS verified-boot requirements.
-
-All BIOS tests are categorized into 5 test levels:
- Level-1: Basic BIOS tests which verify basic vboot functions.
- Level-2: Recovery BIOS tests which need external USB disk.
- Level-3: Corruption BIOS tests which modify firmware/kernel image.
- These tests may corrupt the system if any failure happens.
- Level-4: Advanced BIOS tests which verify not-so-critical features.
- Level-5: Firmware update tests which update firmware/kernel image.
-
-This suite runs all Level-1 tests.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
- 'labels': ['FW-labblocker', 'Restrict-View-Google'],
- 'owner': '',
- 'status': None,
- 'summary': None,
- 'title': None,
-}
-
-args_dict['name'] = 'faft_lv1'
-args_dict['file_bugs'] = False
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.faft_lv2 b/test_suites/control.faft_lv2
deleted file mode 100644
index c72aea9..0000000
--- a/test_suites/control.faft_lv2
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright (c) 2012 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "faft_lv2"
-PURPOSE = "Test hard-to-automate 'normal' mode firmware scenarios."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-
-This test suite runs FAFT (Fully Automated Firmware Test) for BIOS that should
-all pass and that verifies the BIOS fit Chrome OS verified-boot requirements.
-
-All BIOS tests are categorized into 5 test levels:
- Level-1: Basic BIOS tests which verify basic vboot functions.
- Level-2: Recovery BIOS tests which need external USB disk.
- Level-3: Corruption BIOS tests which modify firmware/kernel image.
- These tests may corrupt the system if any failure happens.
- Level-4: Advanced BIOS tests which verify not-so-critical features.
- Level-5: Firmware update tests which update firmware/kernel image.
-
-This suite runs all Level-2 tests.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
- 'labels': ['FW-labblocker', 'Restrict-View-Google'],
- 'owner': '',
- 'status': None,
- 'summary': None,
- 'title': None,
-}
-
-args_dict['file_bugs'] = False
-args_dict['name'] = 'faft_lv2'
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.faft_lv3 b/test_suites/control.faft_lv3
deleted file mode 100644
index 84707e1..0000000
--- a/test_suites/control.faft_lv3
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright (c) 2012 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "faft_lv3"
-PURPOSE = "Test hard-to-automate 'normal' mode firmware scenarios."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-
-This test suite runs FAFT (Fully Automated Firmware Test) for BIOS that should
-all pass and that verifies the BIOS fit Chrome OS verified-boot requirements.
-
-All BIOS tests are categorized into 5 test levels:
- Level-1: Basic BIOS tests which verify basic vboot functions.
- Level-2: Recovery BIOS tests which need external USB disk.
- Level-3: Corruption BIOS tests which modify firmware/kernel image.
- These tests may corrupt the system if any failure happens.
- Level-4: Advanced BIOS tests which verify not-so-critical features.
- Level-5: Firmware update tests which update firmware/kernel image.
-
-This suite runs all Level-3 tests.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
- 'labels': ['FW-labblocker', 'Restrict-View-Google'],
- 'owner': '',
- 'status': None,
- 'summary': None,
- 'title': None,
-}
-
-args_dict['file_bugs'] = False
-args_dict['name'] = 'faft_lv3'
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.faft_lv4 b/test_suites/control.faft_lv4
deleted file mode 100644
index fb97155..0000000
--- a/test_suites/control.faft_lv4
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright (c) 2012 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "faft_lv4"
-PURPOSE = "Test hard-to-automate 'normal' mode firmware scenarios."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-
-This test suite runs FAFT (Fully Automated Firmware Test) for BIOS that should
-all pass and that verifies the BIOS fit Chrome OS verified-boot requirements.
-
-All BIOS tests are categorized into 5 test levels:
- Level-1: Basic BIOS tests which verify basic vboot functions.
- Level-2: Recovery BIOS tests which need external USB disk.
- Level-3: Corruption BIOS tests which modify firmware/kernel image.
- These tests may corrupt the system if any failure happens.
- Level-4: Advanced BIOS tests which verify not-so-critical features.
- Level-5: Firmware update tests which update firmware/kernel image.
-
-This suite runs all Level-4 tests.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
- 'labels': ['FW-labblocker', 'Restrict-View-Google'],
- 'owner': '',
- 'status': None,
- 'summary': None,
- 'title': None,
-}
-
-args_dict['file_bugs'] = False
-args_dict['job'] = job
-args_dict['name'] = 'faft_lv4'
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.faft_lv5 b/test_suites/control.faft_lv5
deleted file mode 100644
index 41cf6ee..0000000
--- a/test_suites/control.faft_lv5
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 2015 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "faft_lv5"
-PURPOSE = "Test hard-to-automate 'normal' mode firmware scenarios."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-
-This test suite runs FAFT (Fully Automated Firmware Test) for BIOS that should
-all pass and that verifies the BIOS fit Chrome OS verified-boot requirements.
-
-All BIOS tests are categorized into 5 test levels:
- Level-1: Basic BIOS tests which verify basic vboot functions.
- Level-2: Recovery BIOS tests which need external USB disk.
- Level-3: Corruption BIOS tests which modify firmware/kernel image.
- These tests may corrupt the system if any failure happens.
- Level-4: Advanced BIOS tests which verify not-so-critical features.
- Level-5: Firmware update tests which update firmware/kernel image.
-
-This suite runs all Level-5 tests.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
- 'labels': ['FW-labblocker', 'Restrict-View-Google'],
- 'owner': '',
- 'status': None,
- 'summary': None,
- 'title': None,
-}
-
-args_dict['file_bugs'] = False
-args_dict['job'] = job
-args_dict['name'] = 'faft_lv5'
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.faft_normal b/test_suites/control.faft_normal
deleted file mode 100644
index aea72bd..0000000
--- a/test_suites/control.faft_normal
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright (c) 2012 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "faft_normal"
-PURPOSE = "Test hard-to-automate 'normal' mode firmware scenarios."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-
-This is a faft (FULLY AUTOMATED FIRMWARE TEST) suite. The tests in this suite
-operate on the DUT in 'normal' mode, where verified boot is fully enforced.
-The tests verfiy that valid boot scenarios progress properly (with state
-progress checks) and that error scenarios (corrupted blobs) are caught as
-expected. Some of these test failures should close the tree as they may imply
-that the system is unbootable and further tests will only become hung or
-blocked. Other tests verify all of the features (some of them security
-related) are functioning.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
- 'labels': ['FW-labblocker', 'Restrict-View-Google'],
- 'owner': '',
- 'status': None,
- 'summary': None,
- 'title': None,
-}
-
-args_dict['file_bugs'] = False
-args_dict['name'] = 'faft_normal'
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.faft_pd b/test_suites/control.faft_pd
deleted file mode 100644
index c3b3606..0000000
--- a/test_suites/control.faft_pd
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2019 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "faft_pd"
-PURPOSE = "Stress test hard-to-automate USB PD behaviors."
-
-TIME = "LONG"
-TEST_CATEGORY = "Stress"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the faft_pd test suite. The tests in this suites verify the behaviors
-of the USB PD stack, like establishing a PD contract, hard and soft resets,
-data role swap, power role swap, VBUS voltage negotiation, etc.
-
-This suite only tests a single Type-C port connecting to the PDTester device
-(Plankton or Servo v4). For DUT with multiple Type-C ports, should run this
-suite multiple time for all the Type-C ports.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
- 'labels': ['FW-labblocker', 'Restrict-View-Google'],
- 'owner': '',
- 'status': None,
- 'summary': None,
- 'title': None,
-}
-
-args_dict['file_bugs'] = False
-args_dict['name'] = 'faft_pd'
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.faft_setup b/test_suites/control.faft_setup
deleted file mode 100644
index 5d7ceec..0000000
--- a/test_suites/control.faft_setup
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright (c) 2016 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "faft_setup"
-PURPOSE = "Suite to setup and run validity checks to ensure DUT is ready for FAFT"
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is a faft (FULLY AUTOMATED FIRMWARE TEST) suite. The tests in this suite
-verify that the DUT is setup properly for running FAFT tests.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
- 'labels': ['Restrict-View-Google'],
- 'owner': '',
- 'status': None,
- 'summary': None,
- 'title': None,
-}
-
-args_dict['file_bugs'] = False
-args_dict['name'] = 'faft_setup'
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.faft_smoke b/test_suites/control.faft_smoke
deleted file mode 100644
index 88c43d6..0000000
--- a/test_suites/control.faft_smoke
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright (c) 2016 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "faft_smoke"
-PURPOSE = "Smoke test of new firmware."""
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite runs a small set of FAFT tests (AP and EC) and finishes within
-10mins. It is used as a smoke test in pre-CQ for any firmware related CLs.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
- 'labels': ['FW-labblocker', 'Restrict-View-Google'],
- 'owner': '',
- 'status': None,
- 'summary': None,
- 'title': None,
-}
-
-args_dict['file_bugs'] = False
-args_dict['name'] = 'faft_smoke'
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.faft_unstable b/test_suites/control.faft_unstable
deleted file mode 100644
index ef7b5bc..0000000
--- a/test_suites/control.faft_unstable
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright (c) 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "faft_unstable"
-PURPOSE = "Unstable suite to test faft_bios and faft_ec."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the faft_unstable test suite, for AP (BIOS) and EC firmware.
-
-This suite is meant to be a proving ground for AP/EC firmware tests before they
-are promoted to the actual faft_bios / faft_ec suites. Flaky tests should also
-be moved here while they're being worked on.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = 'faft_unstable'
-args_dict['add_experimental'] = True
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.faft_wilco b/test_suites/control.faft_wilco
deleted file mode 100644
index 28ce4df..0000000
--- a/test_suites/control.faft_wilco
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2019 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "faft_wilco"
-PURPOSE = "Test Wilco-specific firmware behavior."
-
-TIME = "LONG"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the faft_wilco test suite.
-
-This verifies Wilco-specific firmware behaviors.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['suite_dependencies'] = 'board:sarien'
-args_dict['name'] = 'faft_wilco'
-args_dict['add_experimental'] = True
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.fingerprint b/test_suites/control.fingerprint
deleted file mode 100644
index 025a3a3..0000000
--- a/test_suites/control.fingerprint
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2019 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "fingerprint"
-PURPOSE = "Runs fingerprint firmware tests."
-
-TIME = "LONG"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the automated fingerprint firmware test suite.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.fingerprint-cq b/test_suites/control.fingerprint-cq
deleted file mode 100644
index d71b413..0000000
--- a/test_suites/control.fingerprint-cq
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Fingerprint Team"
-NAME = "fingerprint-cq"
-PURPOSE = "Run fingerprint-related critical tests."
-
-TIME = "MEDIUM"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """ This suite runs fingerprint-related critical tests. """
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['max_runtime_mins'] = 60
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.fingerprint-mcu-dragonclaw b/test_suites/control.fingerprint-mcu-dragonclaw
deleted file mode 100644
index 296e60e..0000000
--- a/test_suites/control.fingerprint-mcu-dragonclaw
+++ /dev/null
@@ -1,24 +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.
-
-AUTHOR = "yichengli@chromium.org"
-NAME = "fingerprint-mcu-dragonclaw"
-PURPOSE = "Verify fingerprint MCU unittests pass on device."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """ This suite runs fingerprint MCU unittests on Dragonclaw boards. """
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['max_runtime_mins'] = 60
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.gce-sanity b/test_suites/control.gce-sanity
deleted file mode 100644
index 4ad55f2..0000000
--- a/test_suites/control.gce-sanity
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2017 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.
-
-AUTHOR = "wonderfly@google.com, adityakali@google.com"
-NAME = "gce-sanity"
-PURPOSE = "Minimal set of tests that verify e.g., an image boots on GCE."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-The GCE smoke suite has tests that appear to be somewhat flaky, mostly due
-to their external dependencies such as GCE metadata server and GCR. This suite
-contains only tests that are stable enough to run on CQ (paladin) builders.
-
-Currently only used by lakitu boards.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = 'gce-sanity'
-args_dict['add_experimental'] = True
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.gce-smoke b/test_suites/control.gce-smoke
deleted file mode 100644
index bc644f1..0000000
--- a/test_suites/control.gce-smoke
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2015 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.
-
-AUTHOR = "wonderfly@google.com, adityakali@google.com"
-NAME = "gce-smoke"
-PURPOSE = "Basic tests that are able to run on GCE"
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-GCE Smoke tests suite is a set of tests designed to run on GCE instances. All of
-these tests run on all buildbot builds for GCE boards.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = 'gce-smoke'
-args_dict['add_experimental'] = True
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.graphics b/test_suites/control.graphics
deleted file mode 100644
index f1d147f..0000000
--- a/test_suites/control.graphics
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright (c) 2012 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "graphics"
-PURPOSE = "Test graphics functionality."
-
-TIME = "MEDIUM"
-TEST_CATEGORY = "Graphics"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the graphics test suite. It should consist of functional and stressful
-graphics tests. In general we don't want these tests to hang the system,
-although this may happen especially with piglit. For functionality contact
-suite owners: ihf|sabercrombie|marcheu@chromium.org
-
-Tests should be run in order of increasing likeness of hanging the system
-graphics_GLAPICheck < 1 minute runtime
-graphics_Check < 1 minute
-graphics_SanAngeles 3 minutes
-graphics_GLBench 5 minutes
-graphics_Piglit 10..15 minutes on OpenGL/Intel only
-
-The machine should reboot after finishing the suite or timing out.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['max_runtime_mins'] = 240
-args_dict['add_experimental'] = True
-args_dict['name'] = 'graphics'
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.graphics_browser b/test_suites/control.graphics_browser
deleted file mode 100644
index ac98efa..0000000
--- a/test_suites/control.graphics_browser
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2014 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.
-
-AUTHOR = "graphics-gfx"
-NAME = "graphics_browser"
-PURPOSE = "Test graphics browser level functionality."
-
-TIME = "MEDIUM"
-TEST_CATEGORY = "Graphics"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the graphics test suite containing browser level tests.
-
-The machine should reboot after finishing the suite or timing out.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['max_runtime_mins'] = 240
-args_dict['add_experimental'] = True
-args_dict['name'] = 'graphics_browser'
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.graphics_per-build b/test_suites/control.graphics_per-build
deleted file mode 100644
index 0aebc9f..0000000
--- a/test_suites/control.graphics_per-build
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2019 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.
-
-AUTHOR = "chromeos-gfx"
-NAME = "graphics_per-build"
-PURPOSE = "Graphics tests"
-
-TIME = "MEDIUM"
-TEST_CATEGORY = "Graphics"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the part of the graphics test suite which should run once per build.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['max_runtime_mins'] = 960
-args_dict['timeout_mins'] = 1440
-args_dict['file_bugs'] = False
-args_dict['name'] = 'graphics_per-build'
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.graphics_per-day b/test_suites/control.graphics_per-day
deleted file mode 100644
index 21483b3..0000000
--- a/test_suites/control.graphics_per-day
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2014 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.
-
-AUTHOR = "chromeos-gfx"
-NAME = "graphics_per-day"
-PURPOSE = "Graphics tests."
-
-TIME = "MEDIUM"
-TEST_CATEGORY = "Graphics"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the part of the graphics test suite which should run once every day.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['max_runtime_mins'] = 1440
-args_dict['timeout_mins'] = 2880
-args_dict['file_bugs'] = False
-args_dict['name'] = 'graphics_per-day'
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.graphics_per-week b/test_suites/control.graphics_per-week
deleted file mode 100644
index 43e7e51..0000000
--- a/test_suites/control.graphics_per-week
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2019 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.
-
-AUTHOR = "chromeos-gfx"
-NAME = "graphics_per-week"
-PURPOSE = "Graphics tests."
-
-TIME = "MEDIUM"
-TEST_CATEGORY = "Graphics"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the part of the graphics test suite which should run once every week.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['max_runtime_mins'] = 1440
-args_dict['timeout_mins'] = 4320
-args_dict['file_bugs'] = False
-args_dict['name'] = 'graphics_per-week'
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.graphics_system b/test_suites/control.graphics_system
deleted file mode 100644
index 91c61ed..0000000
--- a/test_suites/control.graphics_system
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2014 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.
-
-AUTHOR = "graphics-gfx"
-NAME = "graphics_system"
-PURPOSE = "Test graphics system level functionality (no browser)."
-
-TIME = "MEDIUM"
-TEST_CATEGORY = "Graphics"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the graphics test suite containing system level tests.
-Tests in this suite should have no dependencies on the browser, login etc.
-
-The machine should reboot after finishing the suite or timing out.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['max_runtime_mins'] = 240
-args_dict['add_experimental'] = True
-args_dict['name'] = 'graphics_system'
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.gts b/test_suites/control.gts
deleted file mode 100644
index 60bea46..0000000
--- a/test_suites/control.gts
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2016 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.
-
-AUTHOR = "ARC++ Team"
-NAME = "gts"
-PURPOSE = "GTS tests for ARC++"
-CRITERIA = "All tests with SUITE=gts must pass."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite wraps the current GTS bundle for autotest.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-
-def predicate(test):
- if not hasattr(test, 'suite') or not hasattr(test, 'name'):
- return False
- if not test.suite == NAME:
- return False
- # Strip off the cheets_GTS. from the test name before comparing to args
- name = test.name[test.name.find('.') + 1:]
- if 'tests' in args_dict and name not in args_dict['tests']:
- return False
- return True
-
-args_dict['name'] = NAME
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['predicate'] = predicate
-dynamic_suite.reimage_and_run(**args_dict)
-
diff --git a/test_suites/control.hardware_memoryqual b/test_suites/control.hardware_memoryqual
deleted file mode 100644
index fe490e3..0000000
--- a/test_suites/control.hardware_memoryqual
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright (c) 2013 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.
-
-AUTHOR = 'gwendal'
-NAME = 'memory_qual'
-TIME = 'LENGTHY'
-TEST_CATEGORY = 'General'
-TEST_CLASS = 'suite'
-TEST_TYPE = 'Server'
-
-DOC = """
-This dynamic suite runs the memory qualification tests.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-@param file_bugs: If True your suite will file bugs on failures.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-from autotest_lib.client.common_lib import utils
-
-args_dict['add_experimental'] = True
-args_dict['timeout_mins'] = 40320 # entire suite timeout after 28 days
-args_dict['max_runtime_mins'] = 40320 # one test timeout after 28 days
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-# Don't wait for results, just kick off child job.
-args_dict['wait_for_results'] = False
-
-# Retrieve bug_id, part_id for the avl process.
-avl_keyval = dict()
-avl_keyval['bug_id'] = args_dict.get("bug_id", "")
-avl_keyval['part_id'] = args_dict.get("part_id", "")
-utils.write_keyval(job.resultdir, avl_keyval)
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.hardware_memoryqual_quick b/test_suites/control.hardware_memoryqual_quick
deleted file mode 100644
index 94649dc..0000000
--- a/test_suites/control.hardware_memoryqual_quick
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright (c) 2013 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.
-
-AUTHOR = 'gwendal'
-NAME = 'memory_qual_quick'
-TIME = 'LENGTHY'
-TEST_CATEGORY = 'General'
-TEST_CLASS = 'suite'
-TEST_TYPE = 'Server'
-
-DOC = """
-This dynamic suite runs the test version of the memory qualification
-test run by OEM using moblab.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-@param file_bugs: If True your suite will file bugs on failures.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['timeout_mins'] = 40320 # entire suite timeout after 28 days
-args_dict['max_runtime_mins'] = 40320 # one test timeout after 28 days
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.hardware_storagequal b/test_suites/control.hardware_storagequal
deleted file mode 100644
index 27ed7b9..0000000
--- a/test_suites/control.hardware_storagequal
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright (c) 2013 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.
-
-AUTHOR = 'gwendal'
-NAME = 'storage_qual'
-TIME = 'LENGTHY'
-TEST_CATEGORY = 'General'
-TEST_CLASS = 'suite'
-TEST_TYPE = 'Server'
-
-DOC = """
-This dynamic suite runs the storage qualification tests.
-Until issue with suspendstress are fixed, use qual storage_qual_temp instead
-of this one.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-@param file_bugs: If True your suite will file bugs on failures.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['timeout_mins'] = 40320 # entire suite timeout after 28 days
-args_dict['max_runtime_mins'] = 40320 # one test timeout after 28 days
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.hardware_storagequal_cq b/test_suites/control.hardware_storagequal_cq
deleted file mode 100644
index 406456a..0000000
--- a/test_suites/control.hardware_storagequal_cq
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright (c) 2013 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.
-
-AUTHOR = 'mattmallett'
-NAME = 'storage_qual_cq'
-TIME = 'SHORT'
-TEST_CATEGORY = 'General'
-TEST_CLASS = 'suite'
-TEST_TYPE = 'Server'
-
-DOC = """
-Test the moblab mechanisms that run the storage qual suite in the cq
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-@param file_bugs: If True your suite will file bugs on failures.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['timeout_mins'] = 30
-args_dict['max_runtime_mins'] = 30
-args_dict['name'] = NAME
-args_dict['job'] = job
-args_dict['test_args'] = {
- 'bug_id': '',
- 'part_id': ''
-}
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.hardware_storagequal_external b/test_suites/control.hardware_storagequal_external
deleted file mode 100644
index 66cef4a..0000000
--- a/test_suites/control.hardware_storagequal_external
+++ /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.
-
-AUTHOR = 'asavery'
-NAME = 'storage_qual_external'
-TIME = 'LENGTHY'
-TEST_CATEGORY = 'General'
-TEST_CLASS = 'suite'
-TEST_TYPE = 'Server'
-
-DOC = """
-This dynamic suite runs the storage qualification tests for external devices.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-@param file_bugs: If True your suite will file bugs on failures.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['timeout_mins'] = 1440 # entire suite timeout after 1 day
-args_dict['max_runtime_mins'] = 1440 # one test timeout after 1 day
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.hardware_storagequal_mini_soak b/test_suites/control.hardware_storagequal_mini_soak
deleted file mode 100644
index 8ee9180..0000000
--- a/test_suites/control.hardware_storagequal_mini_soak
+++ /dev/null
@@ -1,35 +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.
-
-AUTHOR = 'abergman'
-NAME = 'storage_qual_mini_soak'
-TIME = 'LENGTHY'
-TEST_CATEGORY = 'General'
-TEST_CLASS = 'suite'
-TEST_TYPE = 'Server'
-
-DOC = """
-This dynamic suite runs the minimal storage qualification tests.
-This test suite is needed for comparison with storage qual v2 test.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-@param file_bugs: If True your suite will file bugs on failures.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['timeout_mins'] = 720 # entire suite timeout is 12 hours
-args_dict['max_runtime_mins'] = 720 # one test timeout is 12 hours
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.hardware_storagequal_quick b/test_suites/control.hardware_storagequal_quick
deleted file mode 100644
index 890faf7..0000000
--- a/test_suites/control.hardware_storagequal_quick
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright (c) 2013 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.
-
-AUTHOR = 'gwendal'
-NAME = 'storage_qual_quick'
-TIME = 'LENGTHY'
-TEST_CATEGORY = 'General'
-TEST_CLASS = 'suite'
-TEST_TYPE = 'Server'
-
-DOC = """
-This dynamic suite runs the test version of the storage qualification
-test run by OEM using moblab.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-@param file_bugs: If True your suite will file bugs on failures.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['timeout_mins'] = 40320 # entire suite timeout after 28 days
-args_dict['max_runtime_mins'] = 40320 # one test timeout after 28 days
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.hardware_storagequal_temp b/test_suites/control.hardware_storagequal_temp
deleted file mode 100644
index 23fe210..0000000
--- a/test_suites/control.hardware_storagequal_temp
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright (c) 2013 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.
-
-AUTHOR = 'gwendal'
-NAME = 'storage_qual_temp'
-TIME = 'LENGTHY'
-TEST_CATEGORY = 'General'
-TEST_CLASS = 'suite'
-TEST_TYPE = 'Server'
-
-DOC = """
-This dynamic suite runs the storage qualification tests.
-Until issue with suspendstress are fixed, used this qual instead of
-storage_qual.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-@param file_bugs: If True your suite will file bugs on failures.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.hardware_thermalqual_fast b/test_suites/control.hardware_thermalqual_fast
deleted file mode 100644
index c217ab4..0000000
--- a/test_suites/control.hardware_thermalqual_fast
+++ /dev/null
@@ -1,33 +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.
-
-AUTHOR = 'puthik'
-NAME = 'thermal_qual_fast'
-TIME = 'MEDIUM'
-TEST_CATEGORY = 'General'
-TEST_CLASS = 'suite'
-TEST_TYPE = 'Server'
-
-DOC = """
-This dynamic suite runs the test version of the memory qualification
-test run by OEM using moblab.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-@param file_bugs: If True your suite will file bugs on failures.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.hardware_thermalqual_full b/test_suites/control.hardware_thermalqual_full
deleted file mode 100644
index 2a37a97..0000000
--- a/test_suites/control.hardware_thermalqual_full
+++ /dev/null
@@ -1,44 +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.
-
-AUTHOR = 'puthik'
-NAME = 'thermal_qual_full'
-TIME = 'LENGTHY'
-TEST_CATEGORY = 'General'
-TEST_CLASS = 'suite'
-TEST_TYPE = 'Server'
-
-DOC = """
-This dynamic suite runs the memory qualification tests.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-@param file_bugs: If True your suite will file bugs on failures.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-from autotest_lib.client.common_lib import utils
-
-args_dict['add_experimental'] = True
-args_dict['timeout_mins'] = 40320 # entire suite timeout after 28 days
-args_dict['max_runtime_mins'] = 40320 # one test timeout after 28 days
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-# Don't wait for results, just kick off child job.
-args_dict['wait_for_results'] = False
-
-# Retrieve bug_id, part_id for the avl process.
-avl_keyval = dict()
-avl_keyval['bug_id'] = args_dict.get("bug_id", "")
-avl_keyval['part_id'] = args_dict.get("part_id", "")
-utils.write_keyval(job.resultdir, avl_keyval)
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.hotrod b/test_suites/control.hotrod
deleted file mode 100644
index 622446d..0000000
--- a/test_suites/control.hotrod
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright (c) 2015 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.
-
-AUTHOR = "Harpreet Grewal <harpreet@chromium.org>"
-NAME = "hotrod"
-PURPOSE = "Automated testing of hotrod."
-
-TIME = "LONG"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "suite"
-TEST_TYPE = "server"
-
-DOC = """
-This suite runs the set of hotrod tests on various CFM devices in the lab.
-
-DUTs are expected NOT to have the "oem_device_requisition"="remora" firmware key.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
- 'components': ['UI>Shell>Kiosk'],
- 'labels': ['Proj-Hotrod', 'Hotrod-Auto-Bug'],
- 'owner': 'chromeos-meetings@chromium.org',
- 'status': None,
- 'summary': None,
- 'title': None,
- 'cc': ['chromeos-meetings@google.com']
-}
-
-args_dict['name'] = NAME
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.hotrod-remora b/test_suites/control.hotrod-remora
deleted file mode 100644
index 98e23a6..0000000
--- a/test_suites/control.hotrod-remora
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright (c) 2015 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.
-
-AUTHOR = "Ryan Snyder <turg@google.com>"
-NAME = "hotrod-remora"
-PURPOSE = "Automated testing of CFM devices with the remora enrollment flag."
-
-TIME = "LONG"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "suite"
-TEST_TYPE = "server"
-
-DOC = """
-This suite runs the set of hotrod-remora tests on various CFM devices in the lab.
-
-DUTs are expected to have the "oem_device_requisition"="remora" firmware key.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
- 'components': ['UI>Shell>Kiosk'],
- 'labels': ['Proj-Hotrod', 'Hotrod-Auto-Bug'],
- 'owner': 'chromeos-meetings@chromium.org',
- 'status': None,
- 'summary': None,
- 'title': None,
- 'cc': ['chromeos-meetings@google.com']
-}
-
-args_dict['name'] = NAME
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.hwqual b/test_suites/control.hwqual
deleted file mode 100644
index ac47032..0000000
--- a/test_suites/control.hwqual
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (c) 2012 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.
-
-AUTHOR = "Jean Zheng <jean@google.com>/Chrome OS PSO"
-NAME = "hwqual"
-TIME = "LONG"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-A Nightly HWQual Suite for qualifying and ensuring the integrity of hardware.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.infra_qual b/test_suites/control.infra_qual
deleted file mode 100644
index a87b71b..0000000
--- a/test_suites/control.infra_qual
+++ /dev/null
@@ -1,26 +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.
-
-AUTHOR = "dbeckett"
-NAME = "infra_qual"
-PURPOSE = "Suite to certify changes in autotest infra prior prod."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite is intended to run a set of tests that will certify major autotest
-infrastructure changes/updates do not break major test libraries, such as
-servo, network, platform, bluetooth, etc.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.infra_qual_cellular b/test_suites/control.infra_qual_cellular
deleted file mode 100644
index 416d5fe..0000000
--- a/test_suites/control.infra_qual_cellular
+++ /dev/null
@@ -1,26 +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.
-
-AUTHOR = "andrewlamb"
-NAME = "infra_qual_cellular"
-PURPOSE = "Cellular suite to certify changes in autotest infra prior prod."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite is intended to run a set of cellular tests that will certify major
-autotest infrastructure changes/updates do not break major test libraries, such
-as servo, network, platform, bluetooth, etc.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.infra_qual_wifi b/test_suites/control.infra_qual_wifi
deleted file mode 100644
index dda05e7..0000000
--- a/test_suites/control.infra_qual_wifi
+++ /dev/null
@@ -1,26 +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.
-
-AUTHOR = "andrewlamb"
-NAME = "infra_qual_wifi"
-PURPOSE = "Wifi suite to certify changes in autotest infra prior prod."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite is intended to run a set of wifi tests that will certify major
-autotest infrastructure changes/updates do not break major test libraries, such
-as servo, network, platform, bluetooth, etc.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.jailed_build b/test_suites/control.jailed_build
deleted file mode 100644
index 9917fff..0000000
--- a/test_suites/control.jailed_build
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright (c) 2013 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "jailed_build"
-PURPOSE = "Quartine potentially dangerous tests."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the suite of tests that are recognized as sometimes leaving a
-machine in an unresponsive state. These tests are run on a restricted
-set of devices, and results for these tests should be considered "best
-effort".
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-
-args_dict['add_experimental'] = True
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.kernel_daily_benchmarks b/test_suites/control.kernel_daily_benchmarks
deleted file mode 100644
index 0569f37..0000000
--- a/test_suites/control.kernel_daily_benchmarks
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright (c) 2012 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.
-
-AUTHOR = "Mike Truty <truty@google.com>/Chrome OS Kernel"
-NAME = "kernel_daily_benchmarks"
-PURPOSE = "Gather benchmark/performance data for kernel evaluation."
-
-TIME = "MEDIUM"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the Kernel Per-Build Benchmarks Test suite. Failures in this test
-suite should not close the tree.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-_BUG_TEMPLATE = {
- 'labels': ['OS-Chrome', 'kernel_daily_benchmarks'],
- 'components': ['OS>Kernel'],
- 'owner': '',
- 'status': None,
- 'summary': None,
- 'title': None,
-}
-
-args_dict['name'] = 'kernel_daily_benchmarks'
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.kernel_daily_regression b/test_suites/control.kernel_daily_regression
deleted file mode 100644
index 96c13c0..0000000
--- a/test_suites/control.kernel_daily_regression
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright (c) 2012 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.
-
-AUTHOR = "Mike Truty <truty@google.com>/Chrome OS Kernel"
-NAME = "kernel_daily_regression"
-PURPOSE = "Test required functionality - longer running than bvt tests usually."
-
-TIME = "LONG"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the Kernel daily Regression Test suite. Failures in this test
-suite should not close the tree.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['name'] = 'kernel_daily_regression'
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.kernel_per-build_benchmarks b/test_suites/control.kernel_per-build_benchmarks
deleted file mode 100644
index 7449886..0000000
--- a/test_suites/control.kernel_per-build_benchmarks
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright (c) 2012 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "kernel_per-build_benchmarks"
-PURPOSE = "Gather benchmark/performance data for kernel evaluation."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the Kernel Per-Build Benchmarks Test suite. Failures in this test
-suite should not close the tree. It should consist of SHORT tests that gather
-data for long-term kernel performance evaluation. It runs on every build so
-it should consist of SHORT tests. Longer running benchmarks should be added
-to kernel_daily_benchmarks or kernel_weekly_benchmarks.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['name'] = 'kernel_per-build_benchmarks'
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.kernel_per-build_regression b/test_suites/control.kernel_per-build_regression
deleted file mode 100644
index 42bf62e..0000000
--- a/test_suites/control.kernel_per-build_regression
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright (c) 2012 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "kernel_per-build_regression"
-PURPOSE = "Test required functionality - longer running than bvt tests usually."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the Kernel Per-Build Regression Test suite. Failures in this test
-suite should not close the tree. It should consist of tests that are slightly
-longer than expected for bvt runs. Since failures here are not tree-closers,
-it may be used to stage SHORT tests prior to admitting them to the bvt to
-ensure they are stable. Other common tests added here are SHORT tests that
-re-assess corrected issues. Longer running regression tests should be added
-to kernel_daily_regression or kernel_weekly_regression.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['name'] = 'kernel_per-build_regression'
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.kernel_weekly_regression b/test_suites/control.kernel_weekly_regression
deleted file mode 100644
index 8bd12eb..0000000
--- a/test_suites/control.kernel_weekly_regression
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright (c) 2012 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "kernel_weekly_regression"
-PURPOSE = "Test required functionality - longer running than bvt tests usually."
-
-TIME = "LONG"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the Kernel Weekly Regression Test suite. Failures in this test
-suite should not close the tree. It should consist of tests that are too long
-to run in the Kernel daily regression test suite.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['name'] = 'kernel_weekly_regression'
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.kiosk_longevity b/test_suites/control.kiosk_longevity
deleted file mode 100644
index d71e667..0000000
--- a/test_suites/control.kiosk_longevity
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright (c) 2019 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.
-
-AUTHOR = "Ruben Zakarian <rzakarian@chromium.org>"
-NAME = "kiosk_longevity"
-PURPOSE = "Suite for automated kiosk longevity tests."
-
-TIME = "LONG"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "suite"
-TEST_TYPE = "server"
-
-DOC = """
-This suite runs the set of kiosk longevity tests on a device in the lab.
-
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
- 'labels': ['kiosk_longevity'],
- 'owner': '',
- 'status': None,
- 'summary': None,
- 'title': None,
- 'cc': ['chromeos-ent-test@google.com']
-}
-
-args_dict['name'] = NAME
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
\ No newline at end of file
diff --git a/test_suites/control.labqual b/test_suites/control.labqual
deleted file mode 100644
index f42a334..0000000
--- a/test_suites/control.labqual
+++ /dev/null
@@ -1,36 +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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "labqual"
-PURPOSE = "Suite to qualify firmware for low-touch lab"
-
-TIME = "MEDIUM"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the labqual test suite.
-
-It is used to qualify DUTs for low-touch lab deployment.
-This suite focuses on updating and recovery since these are critical for the low-touch lab. DUTs must pass these tests 100% before entering the lab, so only tests that are critical should be included.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = 'labqual'
-args_dict['add_experimental'] = True
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.labstation_verification b/test_suites/control.labstation_verification
deleted file mode 100644
index 366e564..0000000
--- a/test_suites/control.labstation_verification
+++ /dev/null
@@ -1,37 +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.
-
-AUTHOR = "coconutruben"
-NAME = "labstation_verification"
-PURPOSE = "Test labstation images before release to lab fleet."
-
-TIME = "MEDIUM"
-TEST_CATEGORY = "Infra"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the test-suite that should run against labstations as DUT daily.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['max_runtime_mins'] = 60
-args_dict['timeout_mins'] = 120
-args_dict['file_bugs'] = True
-args_dict['name'] = 'labstation_verification'
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.link_perf b/test_suites/control.link_perf
deleted file mode 100644
index 1b8256e..0000000
--- a/test_suites/control.link_perf
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright (c) 2012 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "link_perf"
-TIME = "SHORT"
-TEST_CATEGORY = "Servo"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-Interim chopped down perf suite for link.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = 'link_perf'
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.manual_platform_suite b/test_suites/control.manual_platform_suite
deleted file mode 100644
index 2494ddd..0000000
--- a/test_suites/control.manual_platform_suite
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright (c) 2016 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "platform_manual_suite"
-PURPOSE = "USB peripherals detection during stress procedure."
-
-TIME = "LONG"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the manually run usb detection test suite.
-
-This suite is meant to cover manual test runs.
-USB detection tests will be exercizing
-USB detect tests during multiple steps.
-Consistent failure to detect peripherals will indicate kernel
-regression.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-
-args_dict['name'] = 'platform_manual_suite'
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.moblab b/test_suites/control.moblab
deleted file mode 100644
index fafa4d4..0000000
--- a/test_suites/control.moblab
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright (c) 2014 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "moblab"
-PURPOSE = "Test critical moblab functionality."
-
-TIME = "LONG"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-Moblab Functionality Tests
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['name'] = 'moblab'
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.moblab-cts-mini b/test_suites/control.moblab-cts-mini
deleted file mode 100644
index 8a73283..0000000
--- a/test_suites/control.moblab-cts-mini
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright (c) 2014 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "moblab-cts-mini"
-PURPOSE = "Ensure that CTS is running on moblab for every commit."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-
-CTS is critical functionality for partners, we need to check and alert
-in the CQ if CTS is not correctly working. This suite runs a very short
-CTS test on moblab.
-
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-
-args_dict['max_runtime_mins'] = 20
-args_dict['name'] = 'moblab-cts-mini'
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.moblab_quick b/test_suites/control.moblab_quick
deleted file mode 100644
index 8969e3a..0000000
--- a/test_suites/control.moblab_quick
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright (c) 2015 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "moblab_quick"
-PURPOSE = "Quickly test basic moblab functionality."
-
-TIME = "MEDIUM"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-Moblab Functionality Tests
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['name'] = 'moblab_quick'
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.moblab_storage_qual b/test_suites/control.moblab_storage_qual
deleted file mode 100644
index 9413818..0000000
--- a/test_suites/control.moblab_storage_qual
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright (c) 2015 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "moblab_storage_qual"
-PURPOSE = "Quickly test basic moblab functionality."
-
-TIME = "MEDIUM"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-Moblab Functionality Tests
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['name'] = 'moblab_quick'
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.mtp b/test_suites/control.mtp
deleted file mode 100644
index 65934fd..0000000
--- a/test_suites/control.mtp
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "ARC Engprod Team"
-NAME = "mtp"
-PURPOSE = "Suite to run MTP(Media Transfer Protocol) tests on Chrome OS devices."
-TIME = "MEDIUM"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-DOC = """ This suite runs MTP tests. """
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-args_dict['max_runtime_mins'] = 180
-args_dict['name'] = NAME
-args_dict['job'] = job
-dynamic_suite.reimage_and_run(**args_dict)
-
diff --git a/test_suites/control.nearby-share b/test_suites/control.nearby-share
deleted file mode 100644
index da46783..0000000
--- a/test_suites/control.nearby-share
+++ /dev/null
@@ -1,20 +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.
-
-AUTHOR = "ChromeOS SW Engprod Team (chromeos-sw-engprod@google.com)"
-NAME = "nearby-share"
-PURPOSE = "Suite to run Nearby Share tests on Chrome OS devices."
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-DOC = """ This suite runs Nearby Share tests. """
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-args_dict['max_runtime_mins'] = 60
-args_dict['name'] = NAME
-args_dict['job'] = job
-dynamic_suite.reimage_and_run(**args_dict)
-
diff --git a/test_suites/control.nearby-share-remote b/test_suites/control.nearby-share-remote
deleted file mode 100644
index a38845a..0000000
--- a/test_suites/control.nearby-share-remote
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "ChromeOS SW Engprod Team (chromeos-sw-engprod@google.com)"
-NAME = "nearby-share-remote"
-PURPOSE = "Suite to run Nearby Share remote tests on Chrome OS devices."
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-DOC = """ This suite runs Nearby Share remote tests. """
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-args_dict['max_runtime_mins'] = 60
-args_dict['name'] = NAME
-args_dict['job'] = job
-dynamic_suite.reimage_and_run(**args_dict)
-
diff --git a/test_suites/control.network_nightly b/test_suites/control.network_nightly
deleted file mode 100644
index 4d4e4ac..0000000
--- a/test_suites/control.network_nightly
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright (c) 2013 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.
-
-AUTHOR = "Chrome OS "
-NAME = "network_nightly"
-PURPOSE = "A simple example suite."
-
-TIME = "SHORT"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This dynamic suite runs a set of client-side networking tests.
-These test connection manager and DHCP behavior.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-@param file_bugs: If True your suite will file bugs on failures.
-@param max_run_time: Amount of time each test shoud run in minutes.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-_BUG_TEMPLATE = {
- 'labels': ['OS-Chrome', 'Type-Bug-Regression'],
- 'components': ['OS>Systems>Network'],
- 'owner': '',
- 'status': 'Untriaged',
- 'summary': None,
- 'title': None,
- 'cc': ['krisr@chromium.org', 'bmahadev@chromium.org',
- 'tienchang@chromium.org']
-}
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 20
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.network_ui b/test_suites/control.network_ui
deleted file mode 100644
index dc80202..0000000
--- a/test_suites/control.network_ui
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright (c) 2013 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "network_ui"
-PURPOSE = "Software-only network UI tests for shill and Chrome integration."
-
-TIME = "SHORT"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "suite"
-TEST_TYPE = "server"
-
-DOC = """
-Run automated tests backed up by a fake hardware simulator (e.g. pseudomodem)
-to test the Chrome OS network UI and the chrome.networkingPrivate extension
-API layer.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
- 'components': ['OS>Systems>Mobile'],
- 'owner': 'armansito@chromium.org',
- 'status': None,
- 'summary': None,
- 'title': None,
- 'cc': ['armansito@chromium.org', 'benchan@chromium.org',
- 'pneubeck@chromium.org', 'stevenjb@chromium.org']
-}
-
-args_dict['file_bugs'] = True
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-args_dict['name'] = 'network_ui'
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.offloads b/test_suites/control.offloads
deleted file mode 100644
index efa315f..0000000
--- a/test_suites/control.offloads
+++ /dev/null
@@ -1,26 +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.
-
-AUTHOR = "jkop, ChromeOS Test Platform Team"
-NAME = "offloads"
-PURPOSE = "Test synchronous offloads for different test types."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-A suite for testing synchronous offloads work as intended.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['max_runtime_mins'] = 10
-args_dict['name'] = NAME
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.partners b/test_suites/control.partners
deleted file mode 100644
index 16f2b68..0000000
--- a/test_suites/control.partners
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2015 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.
-
-AUTHOR = "rohitbm@chromium.org"
-NAME = "partners"
-PURPOSE = "Tests for partners to run functional tests"
-
-TIME = "LONG"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-ChromeOS tests for partners.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['timeout_mins'] = 480
-args_dict['file_bugs'] = False
-args_dict['name'] = 'partners'
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.paygen_au_beta b/test_suites/control.paygen_au_beta
deleted file mode 100644
index dedbff2..0000000
--- a/test_suites/control.paygen_au_beta
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright (c) 2013 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.
-
-AUTHOR = "chromeos-installer@google.com"
-NAME = "paygen_au_beta"
-PURPOSE = "Automated testing of delta payloads generated by paygen."
-
-TIME = "MEDIUM"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite is similar to the au suite except that it's generated during paygen
-and does not close the tree when the tests fail. There will be one test per
-delta generated by paygen for a given release image. These tests (control
-files) are generated at the time we are generating delta payloads, uploaded
-by paygen, and expected to be kicked off by paygen. This suite can be re-run
-at anytime using atest or the autotest web frontend.
-
-Note: the control files used by this suite are auto-generated and the template
-control file is in server/site_tests/autoupdate_EndToEndTest/control.
-
-Note: this suite only tests deltas from the beta channel.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-"""
-
-import common
-from autotest_lib.client.common_lib.cros import dev_server
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-# Needs to be done to generate the control files for the suite.
-ds = dev_server.ImageServer(devserver_url)
-ds.stage_artifacts(build, artifacts=['paygen_au_beta_suite'])
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
- 'components': ['Internals>Installer'],
- 'owner': '',
- 'status': None,
- 'summary': None,
- 'title': None,
- 'cc': ['chromeos-installer-alerts@google.com']
-}
-
-args_dict['max_runtime_mins'] = 60
-args_dict['name'] = NAME
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.paygen_au_canary b/test_suites/control.paygen_au_canary
deleted file mode 100644
index fb4e73c..0000000
--- a/test_suites/control.paygen_au_canary
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright (c) 2013 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.
-
-AUTHOR = "chromeos-installer@google.com"
-NAME = "paygen_au_canary"
-PURPOSE = "Automated testing of delta payloads generated by paygen."
-
-TIME = "MEDIUM"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite is similar to the au suite except that it's generated during paygen
-and does not close the tree when the tests fail. There will be one test per
-delta generated by paygen for a given release image. These tests (control
-files) are generated at the time we are generating delta payloads, uploaded
-by paygen, and expected to be kicked off by paygen. This suite can be re-run
-at anytime using atest or the autotest web frontend.
-
-Note: the control files used by this suite are auto-generated and the template
-control file is in server/site_tests/autoupdate_EndToEndTest/control.
-
-Note: this suite only tests deltas from the canary channel.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-"""
-
-import common
-from autotest_lib.client.common_lib.cros import dev_server
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-# Needs to be done to generate the control files for the suite.
-ds = dev_server.ImageServer(devserver_url)
-ds.stage_artifacts(build, artifacts=['paygen_au_canary_suite'])
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
- 'components': ['Internals>Installer'],
- 'owner': '',
- 'status': None,
- 'summary': None,
- 'title': None,
- 'cc': ['chromeos-installer-alerts@google.com']
-}
-
-args_dict['max_runtime_mins'] = 60
-args_dict['name'] = NAME
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.paygen_au_dev b/test_suites/control.paygen_au_dev
deleted file mode 100644
index 32803c4..0000000
--- a/test_suites/control.paygen_au_dev
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright (c) 2013 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.
-
-AUTHOR = "chromeos-installer@google.com"
-NAME = "paygen_au_dev"
-PURPOSE = "Automated testing of delta payloads generated by paygen."
-
-TIME = "MEDIUM"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite is similar to the au suite except that it's generated during paygen
-and does not close the tree when the tests fail. There will be one test per
-delta generated by paygen for a given release image. These tests (control
-files) are generated at the time we are generating delta payloads, uploaded
-by paygen, and expected to be kicked off by paygen. This suite can be re-run
-at anytime using atest or the autotest web frontend.
-
-Note: the control files used by this suite are auto-generated and the template
-control file is in server/site_tests/autoupdate_EndToEndTest/control.
-
-Note: this suite only tests deltas from the dev channel.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-"""
-
-import common
-from autotest_lib.client.common_lib.cros import dev_server
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-# Needs to be done to generate the control files for the suite.
-ds = dev_server.ImageServer(devserver_url)
-ds.stage_artifacts(build, artifacts=['paygen_au_dev_suite'])
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
- 'components': ['Internals>Installer'],
- 'owner': '',
- 'status': None,
- 'summary': None,
- 'title': None,
- 'cc': ['chromeos-installer-alerts@google.com']
-}
-
-args_dict['max_runtime_mins'] = 60
-args_dict['name'] = NAME
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.paygen_au_stable b/test_suites/control.paygen_au_stable
deleted file mode 100644
index ac0379d..0000000
--- a/test_suites/control.paygen_au_stable
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright (c) 2013 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.
-
-AUTHOR = "chromeos-installer@google.com"
-NAME = "paygen_au_stable"
-PURPOSE = "Automated testing of delta payloads generated by paygen."
-
-TIME = "MEDIUM"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite is similar to the au suite except that it's generated during paygen
-and does not close the tree when the tests fail. There will be one test per
-delta generated by paygen for a given release image. These tests (control
-files) are generated at the time we are generating delta payloads, uploaded
-by paygen, and expected to be kicked off by paygen. This suite can be re-run
-at anytime using atest or the autotest web frontend.
-
-Note: the control files used by this suite are auto-generated and the template
-control file is in server/site_tests/autoupdate_EndToEndTest/control.
-
-Note: this suite only tests deltas from the stable channel.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-"""
-
-import common
-from autotest_lib.client.common_lib.cros import dev_server
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-# Needs to be done to generate the control files for the suite.
-ds = dev_server.ImageServer(devserver_url)
-ds.stage_artifacts(build, artifacts=['paygen_au_stable_suite'])
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
- 'components': ['Internals>Installer'],
- 'owner': '',
- 'status': None,
- 'summary': None,
- 'title': None,
- 'cc': ['chromeos-installer-alerts@google.com']
-}
-
-args_dict['max_runtime_mins'] = 60
-args_dict['name'] = NAME
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.perfalerts b/test_suites/control.perfalerts
deleted file mode 100644
index 606635a..0000000
--- a/test_suites/control.perfalerts
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright (c) 2012 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "perfalerts"
-TIME = "LONG"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "suite"
-TEST_TYPE = "server"
-
-DOC = """
-Run platform_BootPerfServer 100 times across 3 machines for testing boot
-performance.
-This checks for two things:
-1) check that the average time is in range
-2) check that if you boot repeatedly, the average time doesn't increase each
-boot.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = 'perfalerts'
-args_dict['add_experimental'] = True
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.performance_cuj b/test_suites/control.performance_cuj
deleted file mode 100644
index d867bef..0000000
--- a/test_suites/control.performance_cuj
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "abergman, chromeos-engprod-platform-syd"
-NAME = "performance_cuj"
-PURPOSE = "Tast wrapper suite for running performance CUJ Tast tests on Moblab."
-TIME = "LONG"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite executes a set of performance CUJ (critical user journey) test cases.
-Supposed to be run by partners (OEMs, ODMs) using Moblab.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param dry_run: simulate test execution without stressing the storage.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.performance_cuj_experimental b/test_suites/control.performance_cuj_experimental
deleted file mode 100644
index 7e3cd42..0000000
--- a/test_suites/control.performance_cuj_experimental
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "abergman, chromeos-engprod-platform-syd"
-NAME = "performance_cuj_experimental"
-PURPOSE = "Suite for running experimental performance CUJ tests on Moblab."
-TIME = "LONG"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite executes a set of experimental performance CUJs (critical user
-journey) test cases. Supposed to be run by developers of test and for
-verification purposes to validate newly added tests before adding them to the
-production suite.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param dry_run: simulate test execution without stressing the storage.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.performance_cuj_quick b/test_suites/control.performance_cuj_quick
deleted file mode 100644
index 1f26dc5..0000000
--- a/test_suites/control.performance_cuj_quick
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "abergman, chromeos-engprod-platform-syd"
-NAME = "performance_cuj_quick"
-PURPOSE = "Tast wrapper suite for running minimal set of performance CUJ Tast tests on Moblab."
-TIME = "LONG"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite executes a minimal, stable set of performance CUJ (critical user
-journey) test cases. Supposed to be run by partners (OEMs, ODMs) using Moblab as
-a quick check that all included tests are running successfully. Should not
-repeat tests more than once and include only the basic variant for each test.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.platform_test b/test_suites/control.platform_test
deleted file mode 100644
index 3c15967..0000000
--- a/test_suites/control.platform_test
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2018 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.
-
-AUTHOR = "kalin"
-NAME = "platform_test"
-PURPOSE = "Test suite for platform team nightly and perbuild tests."
-
-TIME = "LENGTHY"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-Some of the tests require chameleon connected.
-Others require servo.
-
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['max_runtime_mins'] = 240
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.power_build b/test_suites/control.power_build
deleted file mode 100644
index e626cc6..0000000
--- a/test_suites/control.power_build
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (c) 2012 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "power_build"
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-Run Automated power tests on machines with and without AC.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.power_check b/test_suites/control.power_check
deleted file mode 100644
index 380c89c..0000000
--- a/test_suites/control.power_check
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2018 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "power_check"
-PURPOSE = "Daily power check tests"
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-Daily power check tests.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.power_daily b/test_suites/control.power_daily
deleted file mode 100644
index 6b82fee..0000000
--- a/test_suites/control.power_daily
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright (c) 2012 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "power_daily"
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-Run Automated power tests on machines with and without AC.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-_BUG_TEMPLATE = {
- 'labels': ['OS-Chrome', 'Type-Bug'],
- 'components': ['OS>Kernel>Power'],
- 'owner': '',
- 'status': None,
- 'summary': None,
- 'title': None,
- 'cc': ['dbasehore@chromium.org', 'hennessywill@chromium.org',
- 'tbroch@chromium.org']
-}
-
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.power_dashboard b/test_suites/control.power_dashboard
deleted file mode 100644
index 397962e..0000000
--- a/test_suites/control.power_dashboard
+++ /dev/null
@@ -1,32 +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.
-
-AUTHOR = "puthik"
-NAME = "power_dashboard"
-TIME = "LONG"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-Run Automated power tests on DUTs to upload data to power dashboard.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['max_runtime_mins'] = 720
-args_dict['add_experimental'] = True
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.power_idle b/test_suites/control.power_idle
deleted file mode 100644
index 43df634..0000000
--- a/test_suites/control.power_idle
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2018 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "power_idle"
-PURPOSE = "Measure power usage when system is idle."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This test records power related statistics while the system is idling.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.power_loadtest b/test_suites/control.power_loadtest
deleted file mode 100644
index 7d770b0..0000000
--- a/test_suites/control.power_loadtest
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2018 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "power_loadtest"
-PURPOSE = "Power load testing."
-
-TIME = "LONG"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This test runs a load test consisting of cycling though web pages, playing
-videos, etc. and measures battery power draw.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.power_loadtest_1hour b/test_suites/control.power_loadtest_1hour
deleted file mode 100644
index 55c63b6..0000000
--- a/test_suites/control.power_loadtest_1hour
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2018 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "power_loadtest_1hour"
-PURPOSE = "Power load testing."
-
-TIME = "LONG"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This test runs a load test consisting of cycling though web pages, playing
-videos, etc. and measures battery power draw.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.power_loadtest_fast b/test_suites/control.power_loadtest_fast
deleted file mode 100644
index b26d7c4..0000000
--- a/test_suites/control.power_loadtest_fast
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2018 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "power_loadtest_fast"
-PURPOSE = "Power load testing."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This test runs a load test consisting of cycling though web pages, playing
-videos, etc. and measures battery power draw.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.power_measurement_wrapper b/test_suites/control.power_measurement_wrapper
deleted file mode 100644
index c15689a..0000000
--- a/test_suites/control.power_measurement_wrapper
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2018 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "power_measurement_wrapper"
-PURPOSE = "Power testing."
-
-TIME = "LONG"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This wrapper test automates the process of power measurement while running a
-client test.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.power_qual_fast b/test_suites/control.power_qual_fast
deleted file mode 100644
index b0b88a6..0000000
--- a/test_suites/control.power_qual_fast
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright (c) 2021 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.
-
-AUTHOR = 'mqg'
-NAME = 'power_qual_fast'
-TIME = 'LENGTHY'
-TEST_CATEGORY = 'General'
-TEST_CLASS = 'suite'
-TEST_TYPE = 'Server'
-
-DOC = """
-This dynamic suite runs the test version of the power qualification
-test run by OEM using moblab.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-@param file_bugs: If True your suite will file bugs on failures.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['timeout_mins'] = 2880 # 2 days
-args_dict['max_runtime_mins'] = 2880 # 2 days
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.power_qual_full b/test_suites/control.power_qual_full
deleted file mode 100644
index 1a92877..0000000
--- a/test_suites/control.power_qual_full
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright (c) 2021 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.
-
-AUTHOR = 'mqg'
-NAME = 'power_qual_full'
-TIME = 'LENGTHY'
-TEST_CATEGORY = 'General'
-TEST_CLASS = 'suite'
-TEST_TYPE = 'Server'
-
-DOC = """
-This dynamic suite runs the test version of the power qualification
-test run by OEM using moblab.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-@param file_bugs: If True your suite will file bugs on failures.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['timeout_mins'] = 2880 # 2 days
-args_dict['max_runtime_mins'] = 2880 # 2 days
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.power_requirements b/test_suites/control.power_requirements
deleted file mode 100644
index a7f2be3..0000000
--- a/test_suites/control.power_requirements
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright (c) 2012 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "power_requirements"
-TIME = "LONG"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-Run Automated power tests on machines with and without AC.
-Intended to verify that the DUT meets CrOS power requirements.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R22-2494.33.0
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-_BUG_TEMPLATE = {
- 'labels': ['OS-Chrome', 'Type-Bug'],
- 'components': ['OS>Kernel>Power'],
- 'owner': '',
- 'status': None,
- 'summary': None,
- 'title': None,
- 'cc': ['dbasehore@chromium.org', 'hennessywill@chromium.org',
- 'tbroch@chromium.org']
-}
-
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.powerplay b/test_suites/control.powerplay
deleted file mode 100644
index 43253a2..0000000
--- a/test_suites/control.powerplay
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2016 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.
-
-AUTHOR = "Harpreet Grewal <harpreet@chromium.org>"
-NAME = "powerplay"
-PURPOSE = "Suite for tests using powerplay to collect power data."
-TIME = "LONG"
-TEST_CATEGORY = "Performance"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite runs tests that capture power consumption data from ChromeOS devices
-using powerplay.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
- 'labels': ['power', 'powerplay'],
- 'owner': 'harpreet@chromium.org',
- 'status': None,
- 'summary': None,
- 'title': None,
- 'cc': ['dchan@chromium.org']
-}
-
-args_dict['name'] = 'powerplay'
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.provision b/test_suites/control.provision
deleted file mode 100644
index 95b28f1..0000000
--- a/test_suites/control.provision
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright (c) 2014, 2016 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.
-
-AUTHOR = "Chrome OS Team"
-# This name is hard-coded in run_suite.py
-NAME = "provision"
-PURPOSE = "Provisioning suite job."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """This is a suite job that ultimately provisions a number of DUTs.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-
-args_dict['max_runtime_mins'] = 20
-args_dict['name'] = 'provision'
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-
-dynamic_suite.run_provision_suite(**args_dict)
diff --git a/test_suites/control.push_to_prod b/test_suites/control.push_to_prod
deleted file mode 100644
index cfbb479..0000000
--- a/test_suites/control.push_to_prod
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright (c) 2013 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "push_to_prod"
-PURPOSE = "Test Autotest before push to prod."
-
-TIME = "LONG"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite is designed to test various aspect of Autotest. It should be run
-before push to prod. Design doc:
-https://docs.google.com/a/google.com/document/d/1JMz0xS3fZRSHMpFkkKAL_rxsdbNZomhHbC3B8L71uuI/edit?usp=sharing
-Email chromeos-lab-infrastructure@google.com if you have any question about this
-suite.
-
-This suite sets num to 6 in the reimage_and_run call to make sure we run
-across 6 different machines. This overrides the CROS.sharding_factor option in
-the global_config.
-
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.client.common_lib.cros import dev_server
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
- 'labels': ['push_to_prod'],
- 'owner': '',
- 'status': None,
- 'summary': None,
- 'title': None,
- 'cc': []
-}
-
-args_dict['max_runtime_mins'] = 30
-args_dict['file_bugs'] = True
-args_dict['name'] = 'push_to_prod'
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.pvs-staging b/test_suites/control.pvs-staging
deleted file mode 100644
index e87ea3a..0000000
--- a/test_suites/control.pvs-staging
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "mwiitala, Chrome OS Team"
-NAME = "pvs-staging"
-PURPOSE = "Verify that tests are stable and ready to be run by partners for PVS"
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This test suite is used to verify tests that will become part of the Platform Validation Suite.
-This test suite should not be used for any purposes apart from testing done by the PVS team.
-
-For more info on PVS, please check out go/cros-pvs-prd.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['max_runtime_mins'] = 60
-args_dict['add_experimental'] = True
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
\ No newline at end of file
diff --git a/test_suites/control.pvs-uprev-general b/test_suites/control.pvs-uprev-general
deleted file mode 100644
index ddb982c..0000000
--- a/test_suites/control.pvs-uprev-general
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "pvs-uprev-general"
-PURPOSE = "Verify that we meet the requirements to complete a kernel uprev"
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This test suite is part of the Platform Validation Suite, and verifies that a
-given kernel uprev has achieved the quality necessary to be rolled out to
-users. It can run on Moblab and has no special test bed requirements.
-For more info on PVS, please check out go/cros-pvs-prd.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['max_runtime_mins'] = 60
-args_dict['add_experimental'] = True
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
\ No newline at end of file
diff --git a/test_suites/control.regression b/test_suites/control.regression
deleted file mode 100644
index d5733f7..0000000
--- a/test_suites/control.regression
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright (c) 2012 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "regression"
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-The regression suite ensures that we do not drop below a minimum bar of
-functionality over time. Tests that belong here include those that may run for
-a substantially longer time than the BVT can tolerate, and should exercise
-critical pathways that may not be changed in every build but whose
-functionality should still be verified regularly.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['max_runtime_mins'] = 120
-args_dict['job'] = job
-args_dict['name'] = 'regression'
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.rlz b/test_suites/control.rlz
deleted file mode 100644
index 18d4ddd..0000000
--- a/test_suites/control.rlz
+++ /dev/null
@@ -1,23 +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.
-
-AUTHOR = "Kyle Shimabukuro <kyleshima@chromium.org>"
-NAME = "rlz"
-PURPOSE = "Suite for RLZ tests."
-TIME = "SHORT"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """This suite runs the RLZ tests."""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['add_experimental'] = True
-args_dict['max_runtime_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.runtime_probe_perbuild b/test_suites/control.runtime_probe_perbuild
deleted file mode 100644
index 61c3d3c..0000000
--- a/test_suites/control.runtime_probe_perbuild
+++ /dev/null
@@ -1,43 +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.
-
-AUTHOR = "ckclark@chromium.org, chromeos-runtime-probe@google.com"
-NAME = "runtime_probe_perbuild"
-PURPOSE = "Runtime Probe tests"
-
-TIME = "SHORT"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-ChromeOS Runtime Probe tests.
-
-This suite is used as an entry point for runtime_probe_perbuild, which passes
-cros labels in host info store as references to runtime probe tast tests for
-comparison with probed component names.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to its defaults.
-_BUG_TEMPLATE = {
- 'labels': ['Type-Bug', 'Cros-Runtime-Probe-Test'],
- 'owner': 'ckclark@chromium.org',
- 'cc': ['chromeos-runtime-probe@google.com']
-}
-
-args_dict['max_runtime_mins'] = 10
-args_dict['timeout_mins'] = 10
-args_dict['file_bugs'] = True
-args_dict['name'] = 'runtime_probe_perbuild'
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.sanity b/test_suites/control.sanity
deleted file mode 100644
index bbd65fc..0000000
--- a/test_suites/control.sanity
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2014 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.
-
-AUTHOR = 'chromeos-lab-infrastructure'
-NAME = 'sanity'
-PURPOSE = 'Sanity check run in buildbot to ensure the build will not break duts'
-
-TIME = 'SHORT'
-TEST_CATEGORY = 'General'
-TEST_CLASS = 'suite'
-TEST_TYPE = 'Server'
-
-DOC = """
-This suite is intended to be run by buildbot as a sanity check of the build.
-It currently only contains a dummy_Pass test. It works by relying
-on the safety checks built into the provisioning code to identify bad builds.
-
-This suite is intended to block other bvt suites, and as such is highly
-restricted because of the potential performance costs.
-
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.sb65-presubmit b/test_suites/control.sb65-presubmit
deleted file mode 100644
index 05f5235..0000000
--- a/test_suites/control.sb65-presubmit
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2016 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.
-
-AUTHOR = "SB65 Team"
-NAME = "sb65-presubmit"
-PURPOSE = "Test basic sb65 functionality in the submit queue."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-Suite for kicking off the SB65 presubmit testing.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-
-args_dict['max_runtime_mins'] = 20
-args_dict['name'] = 'sb65-presubmit'
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.security b/test_suites/control.security
deleted file mode 100644
index 3d4c8f8..0000000
--- a/test_suites/control.security
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright (c) 2012 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "security"
-PURPOSE = "Test security related functionality."
-
-TIME = "LONG"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the Security Test suite. It should consist of tests that validate
-security related functionality -- Dbus attack surface, kernel restrictions,
-robustness when dealing with poorly formed HTTP responses, renderer sandbox,
-etc.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = 'security'
-args_dict['add_experimental'] = True
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.security_weekly b/test_suites/control.security_weekly
deleted file mode 100644
index 4447f41..0000000
--- a/test_suites/control.security_weekly
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright (c) 2013 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "security_weekly"
-PURPOSE = "Test long-running security related functionality each week."
-
-TIME = "LONG"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the long-running Security Test suite. It should consist of tests that validate
-security related functionality and take long enough to run that they cannot
-be added to the regular 'security' suit.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['name'] = 'security_weekly'
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.skylab_staging_test b/test_suites/control.skylab_staging_test
deleted file mode 100644
index 3334d5b..0000000
--- a/test_suites/control.skylab_staging_test
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2018 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "skylab_staging_test"
-PURPOSE = "Test Skylab (and lucifer, autotest) before push to prod."
-
-TIME = "LONG"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite is designed to test various aspect of Skylab.
-It is run as part of staging tests. See also ./control.push_to_prod
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.client.common_lib.cros import dev_server
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
- 'labels': ['skylab_staging_test'],
- 'owner': '',
- 'status': None,
- 'summary': None,
- 'title': None,
- 'cc': []
-}
-
-args_dict['max_runtime_mins'] = 30
-args_dict['file_bugs'] = False
-args_dict['name'] = 'skylab_staging_test'
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.smoke b/test_suites/control.smoke
deleted file mode 100644
index 28601ca..0000000
--- a/test_suites/control.smoke
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright (c) 2012 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "smoke"
-PURPOSE = "Basic tests that are able to run in VMs"
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-The smoke suite is a subset of tests specifically chosen to run in virtual
-machines, primarily for early testing on dedicated lab builders.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = 'smoke'
-args_dict['add_experimental'] = True
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.storage_qual_v2_l b/test_suites/control.storage_qual_v2_l
deleted file mode 100644
index dca8aa7..0000000
--- a/test_suites/control.storage_qual_v2_l
+++ /dev/null
@@ -1,33 +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.
-
-AUTHOR = "abergman, chromeos-engprod-platform-syd"
-NAME = "storage_qual_v2_l"
-PURPOSE = "Tast version of a full storage qualification test for running on Moblab."
-TIME = "LENGTHY"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite executes a full version of the storage qualification test suite
-run by partners (OEMs, ODMs and component manufacturers) using Moblab.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param dry_run: simulate test execution without stressing the storage.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['job'] = job
-args_dict['size'] = 'l' # s=Small, m=Medium, l=Large, xl=Extra Large
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.storage_qual_v2_m b/test_suites/control.storage_qual_v2_m
deleted file mode 100644
index 527921b..0000000
--- a/test_suites/control.storage_qual_v2_m
+++ /dev/null
@@ -1,33 +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.
-
-AUTHOR = "abergman, chromeos-engprod-platform-syd"
-NAME = "storage_qual_v2_m"
-PURPOSE = "Tast version of a full storage qualification test for running on Moblab."
-TIME = "LENGTHY"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite executes a full version of the storage qualification test suite
-run by partners (OEMs, ODMs and component manufacturers) using Moblab.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param dry_run: simulate test execution without stressing the storage.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['job'] = job
-args_dict['size'] = 'm' # s=Small, m=Medium, l=Large, xl=Extra Large
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.storage_qual_v2_quick b/test_suites/control.storage_qual_v2_quick
deleted file mode 100644
index 8ef6291..0000000
--- a/test_suites/control.storage_qual_v2_quick
+++ /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.
-
-AUTHOR = "abergman, chromeos-engprod-platform-syd"
-NAME = "storage_qual_v2_quick"
-PURPOSE = "Tast version of a quick storage qualification test for running on Moblab."
-TIME = "MEDIUM"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite executes a short version of the storage qualification test suite
-run by partners (OEMs, ODMs and component manufacturers) using Moblab.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param dry_run: simulate test execution without stressing the storage.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 720 # 12 hours
-args_dict['timeout_mins'] = 720 # 12 hours
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.storage_qual_v2_s b/test_suites/control.storage_qual_v2_s
deleted file mode 100644
index 943ba91..0000000
--- a/test_suites/control.storage_qual_v2_s
+++ /dev/null
@@ -1,33 +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.
-
-AUTHOR = "abergman, chromeos-engprod-platform-syd"
-NAME = "storage_qual_v2_s"
-PURPOSE = "Tast version of a full storage qualification test for running on Moblab."
-TIME = "LENGTHY"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite executes a full version of the storage qualification test suite
-run by partners (OEMs, ODMs and component manufacturers) using Moblab.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param dry_run: simulate test execution without stressing the storage.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['job'] = job
-args_dict['size'] = 's' # s=Small, m=Medium, l=Large, xl=Extra Large
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.storage_qual_v2_xl b/test_suites/control.storage_qual_v2_xl
deleted file mode 100644
index c21a63a..0000000
--- a/test_suites/control.storage_qual_v2_xl
+++ /dev/null
@@ -1,33 +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.
-
-AUTHOR = "abergman, chromeos-engprod-platform-syd"
-NAME = "storage_qual_v2_xl"
-PURPOSE = "Tast version of a full storage qualification test for running on Moblab."
-TIME = "LENGTHY"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite executes a full version of the storage qualification test suite
-run by partners (OEMs, ODMs and component manufacturers) using Moblab.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param dry_run: simulate test execution without stressing the storage.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['job'] = job
-args_dict['size'] = 'xl' # s=Small, m=Medium, l=Large, xl=Extra Large
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.storage_qual_v2_xs b/test_suites/control.storage_qual_v2_xs
deleted file mode 100644
index 06b9863..0000000
--- a/test_suites/control.storage_qual_v2_xs
+++ /dev/null
@@ -1,33 +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.
-
-AUTHOR = "abergman, chromeos-engprod-platform-syd"
-NAME = "storage_qual_v2_xs"
-PURPOSE = "Tast version of a full storage qualification test for running on Moblab."
-TIME = "LENGTHY"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite executes a full version of the storage qualification test suite
-run by partners (OEMs, ODMs and component manufacturers) using Moblab.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param dry_run: simulate test execution without stressing the storage.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['job'] = job
-args_dict['size'] = 'xs' # xs=Quick/Extra small, s=Small, m=Medium, l=Large, xl=Extra Large
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.storagequal b/test_suites/control.storagequal
deleted file mode 100644
index 86b06b3..0000000
--- a/test_suites/control.storagequal
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright (c) 2013 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.
-
-AUTHOR = 'jcasse, grundler'
-NAME = 'storagequal'
-TIME = 'LENGTHY'
-TEST_CATEGORY = 'General'
-TEST_CLASS = 'suite'
-TEST_TYPE = 'Server'
-
-DOC = """
-This dynamic suite runs a set of client-side solid-state storage tests.
-These test data integrity, etc.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-@param file_bugs: If True your suite will file bugs on failures.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.stress b/test_suites/control.stress
deleted file mode 100644
index 96f681d..0000000
--- a/test_suites/control.stress
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright (c) 2014 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "stress"
-PURPOSE = "Stress test functionality and devices."
-
-TIME = "LONG"
-TEST_CATEGORY = "Stress"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the stress test suite.
-
-All tests should pass for devices to be considered shippable. This suite is
-meant to cover the full gamut of stress long running stress tests. Other stress
-related suites will focus on more specific aspects, which can be run as
-diagnosis tools.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-_BUG_TEMPLATE = {
- 'labels': ['OS-Chrome', 'StressRack-Bug'],
- 'owner': 'dchan@chromium.org',
-}
-
-
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-args_dict['name'] = 'stress'
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.suite_attr_wrapper b/test_suites/control.suite_attr_wrapper
deleted file mode 100644
index 715dbd5..0000000
--- a/test_suites/control.suite_attr_wrapper
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2015 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.
-
-AUTHOR = "shuqianz, chromeos-infra"
-NAME = "suite_attr_wrapper"
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is a wrapper suite to trigger tests that satisfy any attribute boolean
-expression.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-import logging
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-from autotest_lib.server.cros.dynamic_suite import suite
-
-# Get the predicate object from attr_filter argument
-
-try:
- attr = args_dict['attr_filter']
- attr_predicate = suite.Suite.matches_attribute_expression_predicate(attr)
-except KeyError:
- logging.error('Unable to find the attribute boolean expression used to '
- 'trigger tests in suite_args %s, please use attr_filter '
- 'keyword to specify it. suite aborting' % args_dict)
- raise
-
-args_dict['predicate'] = attr_predicate
-args_dict.setdefault('name', NAME)
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.syzcorpus b/test_suites/control.syzcorpus
deleted file mode 100644
index 1f02fb3..0000000
--- a/test_suites/control.syzcorpus
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "zsm, Chrome OS Kernel Team"
-NAME = "syzcorpus"
-PURPOSE = "Suite to run Syzkaller repros on Chrome OS devices."
-
-TIME = "MEDIUM"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite runs Syzkaller reproducers to test the Chrome OS kernel.
-This is a regression test suite for the kernel(both core and drivers).
-See https://github.com/dvyukov/syzkaller-repros for more information.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['max_runtime_mins'] = 60
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.syzkaller b/test_suites/control.syzkaller
deleted file mode 100644
index 9ab029b..0000000
--- a/test_suites/control.syzkaller
+++ /dev/null
@@ -1,26 +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.
-
-AUTHOR = "mwiitala, Chrome OS Kernel Team"
-NAME = "syzkaller"
-PURPOSE = "Suite to run Syzkaller tests on Chrome OS devices."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite utilizes Syzkaller to fuzz the Chrome OS kernel.
-See go/ctp-syzkaller for more details.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['max_runtime_mins'] = 60
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
\ No newline at end of file
diff --git a/test_suites/control.tablet_mode b/test_suites/control.tablet_mode
deleted file mode 100644
index 6efcff3..0000000
--- a/test_suites/control.tablet_mode
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2017 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.
-
-AUTHOR = "rjahagir"
-NAME = "tablet_mode"
-PURPOSE = "Test tablet mode in certain boards"
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is tablet mode test suite.
-
-This suite is meant to test the tablet mode used in platform testing.
-Consistent failure of these tests indicate issues with transitioning to
-tablet mode.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
- 'labels': ['OS-Chrome', 'tablet_mode'],
- 'components': ['OS>Kernel'],
- 'owner': 'rjahagir@chromium.org',
- 'status': None,
- 'summary': None,
- 'title': None,
- 'cc': ['kalin@chromium.org']
-}
-
-args_dict['suite_dependencies'] = 'accel:cros-ec'
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-args_dict['job'] = job
-args_dict['name'] = NAME
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.telemetry_unit b/test_suites/control.telemetry_unit
deleted file mode 100644
index 47f88cb..0000000
--- a/test_suites/control.telemetry_unit
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright (c) 2013 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "telemetry_unit"
-PURPOSE = "Telemetry unit tests."
-
-TIME = "MEDIUM"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-Telemetry unit test suite.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['name'] = 'telemetry_unit'
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.telemetry_unit_server b/test_suites/control.telemetry_unit_server
deleted file mode 100644
index 178af7e..0000000
--- a/test_suites/control.telemetry_unit_server
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright (c) 2017 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "telemetry_unit_server"
-PURPOSE = "Telemetry unit tests."
-
-TIME = "MEDIUM"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-Telemetry unit test suite.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['name'] = 'telemetry_unit_server'
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.tendo_experimental b/test_suites/control.tendo_experimental
deleted file mode 100644
index ea681cf..0000000
--- a/test_suites/control.tendo_experimental
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2014 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.
-
-AUTHOR = 'wiley, avakulenko, keybuk'
-NAME = 'tendo_experimental'
-PURPOSE = 'Staging ground for Tendo BVT candidates'
-
-TIME = 'SHORT'
-TEST_CATEGORY = 'General'
-TEST_CLASS = 'suite'
-TEST_TYPE = 'Server'
-
-DOC = """
-Before a test is added to the BVT, it must demonstrate a track
-record of stability running in the lab. The track record is
-created by adding it to a suite and allowing it to run. This suite
-groups Tendo related tests for this purpose.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-
-args_dict['add_experimental'] = False
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.test_that_wrapper b/test_suites/control.test_that_wrapper
deleted file mode 100644
index 6d2b34b..0000000
--- a/test_suites/control.test_that_wrapper
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright (c) 2012 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.
-
-AUTHOR = "akeshet, chromeos-lab-infrastructure"
-NAME = "test_that_wrapper"
-PURPOSE = "Wrapper for ad-hoc suites kicked of by test_that tool."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is a wrapper suite for lab jobs that get kicked off by developers
-running the test_that tool on their desks, but targetting devices in the lab.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import logging, shlex
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-from autotest_lib.site_utils import test_runner_utils
-from autotest_lib.site_utils import test_that
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
- 'labels': ['test_that_wrapper'],
- 'owner': '',
- 'status': None,
- 'summary': None,
- 'title': None,
-}
-
-parsed_test_arguments = [test_runner_utils.get_predicate_for_test_arg(test_arg)
- for test_arg in args_dict['tests']]
-sub_predicates, descriptions = zip(*parsed_test_arguments)
-
-logging.info('This is a test_that triggered suite, consisting of:')
-for desc in descriptions:
- logging.info('A %s.', desc)
-
-combined_predicate = lambda test: any(f(test) for f in sub_predicates)
-
-args_dict['name'] = NAME
-args_dict.setdefault('max_runtime_mins', 20)
-args_dict['predicate'] = combined_predicate
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.toolchain-tests b/test_suites/control.toolchain-tests
deleted file mode 100644
index 3f5d756..0000000
--- a/test_suites/control.toolchain-tests
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright (c) 2016 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "toolchain-tests"
-PURPOSE = "Test basic, required functionality for the toolchain team."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is a suite designed to catch all the tests that the toolchain
-team wants to run. They should only be run by the toolchain builbots.
-
-Most of this is copied straight from control.bvt-perbuild, modified
-appropriately.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
- 'labels': ['toolchain-tests'],
- 'owner': '',
- 'status': None,
- 'summary': None,
- 'title': None,
-}
-
-args_dict['max_runtime_mins'] = 20
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['name'] = 'toolchain-tests'
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.touch b/test_suites/control.touch
deleted file mode 100644
index ba908e6..0000000
--- a/test_suites/control.touch
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2019 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.
-
-AUTHOR = "chromeos-test"
-NAME = "touch"
-PURPOSE = "Tests basic touch input functionality."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-Touch input playback based tests.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = 'touch'
-args_dict['add_experimental'] = True
-args_dict['max_runtime_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.typec-lab b/test_suites/control.typec-lab
deleted file mode 100644
index 87130ea..0000000
--- a/test_suites/control.typec-lab
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2021 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "typec-lab"
-PURPOSE = 'Tests the end to end Tast tests in the "typec-lab" category.'
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-Run Tast tests for basic typec/TBT functionality.
-
-The tests are part of 'group:typec'. The 'typec_lab' sub-attribute
-limits it to typec tests.
-
-Tast is an integration-testing framework analagous to the test-running portion
-of Autotest. See https://chromium.googlesource.com/chromiumos/platform/tast/
-for more information.
-
-See http://go/tast-failures for information about investigating failures.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 30
-args_dict['timeout_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.usb-camera b/test_suites/control.usb-camera
deleted file mode 100644
index eb74275..0000000
--- a/test_suites/control.usb-camera
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2017 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.
-
-AUTHOR = "ChromeOS Video and Camera Team/chromeos-video-eng@google.com"
-NAME = "usb-camera"
-PURPOSE = "Test USB camera required functionality."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is USB camera test suite.
-
-The suite is used to test USB cameras to make sure cameras meet ChromeOS
-requirements.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = NAME
-args_dict['add_experimental'] = True
-args_dict['max_runtime_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.usb_detect b/test_suites/control.usb_detect
deleted file mode 100644
index 1532d46..0000000
--- a/test_suites/control.usb_detect
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2016 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "usb_detect"
-PURPOSE = "USB peripherals detection."
-
-TIME = "LONG"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the usb_detect test suite.
-
-This suite is meant to cover boards on different kernel version
-for ARM and non-ARM boards. USB detection tests will be exercizing
-short detect tests and stress scenarios.
-Consistent failure to detect peripherals will indicate kernel
-regression.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-_BUG_TEMPLATE = {
- 'labels': ['OS-Chrome', 'UsbDetect-Bug'],
- 'components': ['OS>Kernel'],
- 'owner': 'kalin@chromium.org',
-}
-
-
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-args_dict['name'] = 'usb_detect'
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.usb_detect_stress b/test_suites/control.usb_detect_stress
deleted file mode 100644
index 8bc9f8b..0000000
--- a/test_suites/control.usb_detect_stress
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright (c) 2016 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "usb_detect_stress"
-PURPOSE = "USB peripherals detection during stress procedure."
-
-TIME = "LONG"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is the usb_detect_stress test suite.
-
-This suite is meant to cover boards on different kernel version
-for ARM and non-ARM boards. USB detection tests will be exercizing
-USB detect tests during multiple steps.
-Consistent failure to detect peripherals will indicate kernel
-regression.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-
-args_dict['add_experimental'] = True
-args_dict['name'] = 'usb_detect_stress'
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.video b/test_suites/control.video
deleted file mode 100644
index cc28d3d..0000000
--- a/test_suites/control.video
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright (c) 2012 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.
-
-AUTHOR = "Rohit Makasana <rohitbm@chromium.org>/chromeos-test@google.com"
-NAME = "video"
-PURPOSE = "Test basic, required functionality."
-
-TIME = "MEDIUM"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-Browser Video integration tests.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to its defaults.
-_BUG_TEMPLATE = {
- 'labels': ['OS-Chrome', 'VideoTestFailure'],
- 'cc': ['chromeos-video-test-failures@google.com'],
-}
-
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-args_dict['max_runtime_mins'] = 240
-args_dict['name'] = 'video'
-args_dict['bug_template'] = _BUG_TEMPLATE
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.video_image_comparison_chameleon b/test_suites/control.video_image_comparison_chameleon
deleted file mode 100644
index 0fbd1b6..0000000
--- a/test_suites/control.video_image_comparison_chameleon
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2015 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.
-
-AUTHOR = "mussa, rohit"
-NAME = "video_image_comparison_chameleon"
-PURPOSE = "Runs video image comparison tests via Chameleon on selected devices"
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-Run video image comparison tests using chameleon. Tests will run on selected set of devices, because they depend on reference images been generated apriori.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['suite_dependencies'] = 'chameleon'
-args_dict['name'] = NAME
-args_dict['max_runtime_mins'] = 60
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.vmtest_informational1 b/test_suites/control.vmtest_informational1
deleted file mode 100644
index b55d90f..0000000
--- a/test_suites/control.vmtest_informational1
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2018 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.
-
-AUTHOR = "chromeos-gfx"
-NAME = "vmtest-informational1"
-PURPOSE = "Long running tests to run in VMs for informational purpose"
-
-TIME = "LENGTHY"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-vmtest-informational1 suite is a set of tests to run in VMs for informational
-purpose. Typically, we would expect this suite runs much longer than smoke
-suite.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = 'vmtest-informational1'
-args_dict['max_runtime_mins'] = 1440
-args_dict['add_experimental'] = True
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.vmtest_informational2 b/test_suites/control.vmtest_informational2
deleted file mode 100644
index 9648635..0000000
--- a/test_suites/control.vmtest_informational2
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2018 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.
-
-AUTHOR = "chromeos-gfx"
-NAME = "vmtest-informational2"
-PURPOSE = "Long running tests to run in VMs for informational purpose"
-
-TIME = "LENGTHY"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-vmtest-informational2 suite is a set of tests to run in VMs for informational
-purpose. Typically, we would expect this suite runs much longer than smoke
-suite.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = 'vmtest-informational2'
-args_dict['max_runtime_mins'] = 1440
-args_dict['add_experimental'] = True
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.vmtest_informational3 b/test_suites/control.vmtest_informational3
deleted file mode 100644
index e7e1861..0000000
--- a/test_suites/control.vmtest_informational3
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2018 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.
-
-AUTHOR = "chromeos-gfx"
-NAME = "vmtest-informational3"
-PURPOSE = "Long running tests to run in VMs for informational purpose"
-
-TIME = "LENGTHY"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-vmtest-informational3 suite is a set of tests to run in VMs for informational
-purpose. Typically, we would expect this suite runs much longer than smoke
-suite.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = 'vmtest-informational3'
-args_dict['max_runtime_mins'] = 1440
-args_dict['add_experimental'] = True
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.vmtest_informational4 b/test_suites/control.vmtest_informational4
deleted file mode 100644
index bb67919..0000000
--- a/test_suites/control.vmtest_informational4
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2018 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.
-
-AUTHOR = "chromeos-gfx"
-NAME = "vmtest-informational4"
-PURPOSE = "Long running tests to run in VMs for informational purpose"
-
-TIME = "LENGTHY"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-vmtest-informational4 suite is a set of tests to run in VMs for informational
-purpose. Typically, we would expect this suite runs much longer than smoke
-suite.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = 'vmtest-informational4'
-args_dict['max_runtime_mins'] = 1440
-args_dict['add_experimental'] = True
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.wifi_atten_perf b/test_suites/control.wifi_atten_perf
deleted file mode 100644
index 47dcb17..0000000
--- a/test_suites/control.wifi_atten_perf
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright (c) 2013 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.
-
-AUTHOR = "wiley@chromium.org"
-NAME = "wifi_atten_perf"
-PURPOSE = "Measure WiFi part performance across signal levels."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is an example of a dynamic test suite.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-@param file_bugs: If True your suite will file bugs on failures.
-@param max_run_time: Amount of time each test shoud run in minutes.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['max_runtime_mins'] = 60 * 6
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.wifi_atten_roam_perf b/test_suites/control.wifi_atten_roam_perf
deleted file mode 100644
index c09592d..0000000
--- a/test_suites/control.wifi_atten_roam_perf
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (c) 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.
-
-AUTHOR = "jakobczyk@google.com"
-NAME = "wifi_atten_roam_perf"
-PURPOSE = "Measure WiFi roaming performance/correctness in simulated DUT movement scenarios."
-
-TIME = "LENGTHY"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite is for WiFi roaming tests that provide data set for analysis rather than clear pass/fail criteria.
-The tests require a setup with two APs connected via a variable attenunator and are executed in the grover pool.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['max_runtime_mins'] = 60 * 5
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.wifi_endtoend b/test_suites/control.wifi_endtoend
deleted file mode 100644
index 23e32ef..0000000
--- a/test_suites/control.wifi_endtoend
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2015 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.
-
-AUTHOR = "bmahadev, harpreet, krisr"
-NAME = "wifi_endtoend"
-PURPOSE = "Verify end-to-end WiFi functionality."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is an example of a dynamic test suite.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-@param file_bugs: If True your suite will file bugs on failures.
-@param max_run_time: Amount of time each test shoud run in minutes.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['max_runtime_mins'] = 60
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.wifi_flaky b/test_suites/control.wifi_flaky
deleted file mode 100644
index 79ccdd2..0000000
--- a/test_suites/control.wifi_flaky
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (c) 2013 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.
-
-AUTHOR = "wiley@chromium.org"
-NAME = "wifi_flaky"
-PURPOSE = "Track and monitor flaky WiFi tests."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-Test suites are great, but if people get used to seeing 2-3 failures per run,
-they stop looking. Move flaky tests from elsewhere and into this suite until
-they can be made stable again. Even flaky tests need to run once in a while.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['max_runtime_mins'] = 60
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.wifi_func_tast b/test_suites/control.wifi_func_tast
deleted file mode 100644
index e1910f5..0000000
--- a/test_suites/control.wifi_func_tast
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright (c) 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.
-
-AUTHOR = "deanliao@chromium.org"
-NAME = "wifi_func_tast"
-PURPOSE = "Test basic WiFi functionalities using Tast framework."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-The suite is a placeholder for new WiFi Tast tests.
-
-It is the landing suite for new/ported WiFi Tast tests. After a test is
-stable enough (say at least the same pass rate compare to Autotest
-version), the test can be moved to suite:wifi_matfunc.
-
-Refer to https://goto.google.com/cros-wifi-tast-suites for detail.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['max_runtime_mins'] = 60
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.wifi_interop b/test_suites/control.wifi_interop
deleted file mode 100644
index 45a925b..0000000
--- a/test_suites/control.wifi_interop
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 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.
-
-AUTHOR = 'tienchang'
-NAME = 'wifi_interop'
-PURPOSE = 'Test WiFi interoperability across third-party consumer APs.'
-TIME = 'LONG'
-TEST_TYPE = 'Server'
-
-DOC = """
-This test suite runs against predetermined DUTs and APs to capture failures
-in connection attempts.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-@param file_bugs: If True your suite will file bugs on failures.
-@param max_run_time: Amount of time each test shoud run in minutes.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['max_runtime_mins'] = 1440
-args_dict['timeout_mins'] = 1440
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.wifi_interop_static b/test_suites/control.wifi_interop_static
deleted file mode 100644
index 9cd8a78..0000000
--- a/test_suites/control.wifi_interop_static
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016 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.
-
-AUTHOR = 'tienchang'
-NAME = 'wifi_interop_static'
-PURPOSE = 'Test WiFi interoperability across third-party consumer APs.'
-TIME = 'LONG'
-TEST_TYPE = 'Server'
-
-DOC = """
-This test suite runs against predetermined DUTs and APs to capture failures
-in connection attempts. This will run in Casey.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-@param file_bugs: If True your suite will file bugs on failures.
-@param max_run_time: Amount of time each test shoud run in minutes.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['max_runtime_mins'] = 1440
-args_dict['timeout_mins'] = 1440
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.wifi_interop_wpa2 b/test_suites/control.wifi_interop_wpa2
deleted file mode 100644
index 20340ec..0000000
--- a/test_suites/control.wifi_interop_wpa2
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2016 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.
-
-AUTHOR = 'bmahadev, tienchang, krisr'
-NAME = 'wifi_interop_wpa2'
-PURPOSE = 'Test WiFi interoperability across third-party consumer APs.'
-TIME = 'LONG'
-TEST_TYPE = 'Server'
-
-DOC = """
-This test suite runs against pre-determined DUTs and APs to capture failures
-in connection attempts.
-
-@param build: The name of the image to test.
- Ex: git_nyc-release/bullhead-userdebug/LATEST
-@param board: The board to test on. Ex: android-bullhead
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-@param file_bugs: If True your suite will file bugs on failures.
-@param max_run_time: Amount of time each test shoud run in minutes.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['max_runtime_mins'] = 1440
-args_dict['timeout_mins'] = 1440
-args_dict['suite_dependencies'] = 'chaos_nightly'
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.wifi_lucidsleep b/test_suites/control.wifi_lucidsleep
deleted file mode 100644
index 0dd94cc..0000000
--- a/test_suites/control.wifi_lucidsleep
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2015 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.
-
-AUTHOR = 'samueltan@chromium.org'
-NAME = 'wifi_lucidsleep'
-PURPOSE = 'Group of WiFi tests that verify Lucid Sleep functionality'
-
-TIME = 'SHORT'
-TEST_CATEGORY = 'General'
-TEST_CLASS = 'suite'
-TEST_TYPE = 'Server'
-
-DOC = """
-This suite is used to verify the functionality of the Lucid Sleep feature.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-@param file_bugs: If True your suite will file bugs on failures.
-@param max_run_time: Amount of time each test shoud run in minutes.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['max_runtime_mins'] = 60
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.wifi_matfunc b/test_suites/control.wifi_matfunc
deleted file mode 100644
index a5ab5a3..0000000
--- a/test_suites/control.wifi_matfunc
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright (c) 2013 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.
-
-AUTHOR = "wiley@chromium.org"
-NAME = "wifi_matfunc"
-PURPOSE = "Verify basic WiFi functionality."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is an example of a dynamic test suite.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-@param file_bugs: If True your suite will file bugs on failures.
-@param max_run_time: Amount of time each test shoud run in minutes.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['max_runtime_mins'] = 60
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.wifi_matfunc_bcm4356 b/test_suites/control.wifi_matfunc_bcm4356
deleted file mode 100644
index 0efb616..0000000
--- a/test_suites/control.wifi_matfunc_bcm4356
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2014 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.
-
-AUTHOR = "wiley@chromium.org, bmahadev@chromium.org"
-NAME = "wifi_matfunc_bcm4356"
-PURPOSE = "Verify basic WiFi functionality."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is an example of a dynamic test suite.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-@param file_bugs: If True your suite will file bugs on failures.
-@param max_run_time: Amount of time each test shoud run in minutes.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['suite_dependencies'] = 'wifi:bcm4356'
-args_dict['max_runtime_mins'] = 60
-args_dict['name'] = NAME
-args_dict['job'] = job
-args_dict['add_experimental'] = True
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.wifi_perf b/test_suites/control.wifi_perf
deleted file mode 100644
index 376cc0d..0000000
--- a/test_suites/control.wifi_perf
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright (c) 2013 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.
-
-AUTHOR = 'wiley, pstew, quiche'
-NAME = 'wifi_perf'
-PURPOSE = 'Measure WiFi performance'
-TIME = 'LONG'
-TEST_TYPE = 'Server'
-
-DOC = """
-This test configures a router in various ways, and measures WiFi performance
-of a test device connected to the router.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-@param file_bugs: If True your suite will file bugs on failures.
-@param max_run_time: Amount of time each test shoud run in minutes.
-
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['max_runtime_mins'] = 60
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.wifi_release b/test_suites/control.wifi_release
deleted file mode 100644
index ae37895..0000000
--- a/test_suites/control.wifi_release
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright (c) 2014 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.
-
-AUTHOR = 'krisr@chromium.org'
-NAME = 'wifi_release'
-PURPOSE = 'Group of WiFi tests that are run against a release candidate'
-
-TIME = 'SHORT'
-TEST_CATEGORY = 'General'
-TEST_CLASS = 'suite'
-TEST_TYPE = 'Server'
-
-DOC = """
-This suite is used for release candidate verification.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-@param file_bugs: If True your suite will file bugs on failures.
-@param max_run_time: Amount of time each test shoud run in minutes.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['max_runtime_mins'] = 60
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.wifi_stress b/test_suites/control.wifi_stress
deleted file mode 100644
index cdf3ef9..0000000
--- a/test_suites/control.wifi_stress
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2016 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.
-
-AUTHOR = 'tienchang'
-NAME = 'wifi_stress'
-PURPOSE = 'Stress test ChromeOS WiFi functionality and performance for 23 hours'
-TIME = 'LONG'
-TEST_TYPE = 'Server'
-
-DOC = """
-This suite contains tests that stress ChromeOS WiFi functionality and
-performance against routers with various network configurations for 23 hours.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-@param file_bugs: If True your suite will file bugs on failures.
-@param max_run_time: Amount of time each test shoud run in minutes.
-
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['max_runtime_mins'] = 1440
-args_dict['timeout_mins'] = 1440
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.wifi_tdls_cast b/test_suites/control.wifi_tdls_cast
deleted file mode 100644
index 259d466..0000000
--- a/test_suites/control.wifi_tdls_cast
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2016 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.
-
-AUTHOR = "cliffordcheng@chromium.org"
-NAME = "wifi_tdls_cast"
-PURPOSE = """
- Verify TDLS is used during mirroring between TDLS enabled
- ChromeOS device and Chromecast.
-"""
-
-TIME = "MEDIUM"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "CLIENT"
-
-DOC = """
-This is an example of a dynamic test suite.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-@param file_bugs: If True your suite will file bugs on failures.
-@param max_run_time: Amount of time each test shoud run in minutes.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['max_runtime_mins'] = 60
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.wifi_update_router b/test_suites/control.wifi_update_router
deleted file mode 100644
index d254cc4..0000000
--- a/test_suites/control.wifi_update_router
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2015 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = "krisr@chromium.org"
-NAME = "wifi_update_router"
-PURPOSE = "Update the wificell routers."
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This is an example of a dynamic test suite.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-@param file_bugs: If True your suite will file bugs on failures.
-@param max_run_time: Amount of time each test shoud run in minutes.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['max_runtime_mins'] = 60
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.wificell-cq b/test_suites/control.wificell-cq
deleted file mode 100644
index 0ebc0be..0000000
--- a/test_suites/control.wificell-cq
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2015 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.
-
-AUTHOR = "tienchang, krisr, bmahadev, wiley"
-NAME = "wificell-cq"
-PURPOSE = "This suite is a baseline set of tests that act as a wifi pre-cq."
-TIME = "SHORT"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This suite acts as a pre-cq specific to ChromeOS WiFi related changes and is
-only invoked via a flag in CLs.
-
-@param build: The name of the image to test.
-@param board: The board to test on.
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-@param file_bugs: If True your suite will file bugs on failures.
-@param max_run_time: Amount of time each test shoud run in minutes.i
-
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['max_runtime_mins'] = 60
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.wifichaos b/test_suites/control.wifichaos
deleted file mode 100644
index e5f0151..0000000
--- a/test_suites/control.wifichaos
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (c) 2012 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.
-
-AUTHOR = "Chrome OS Team"
-NAME = "wifichaos"
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-To get builds installed nightly on the devices in the chaos_lab.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.wilco_bve b/test_suites/control.wilco_bve
deleted file mode 100644
index ece09cf..0000000
--- a/test_suites/control.wilco_bve
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright (c) 2019 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.
-
-AUTHOR = "Ruben Zakarian <rzakarian@chromium.org>"
-NAME = "wilco_bve"
-PURPOSE = "Suite for automated Wilco tests in BVE lab."
-
-TIME = "LONG"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "suite"
-TEST_TYPE = "server"
-
-DOC = """
-This suite runs the set of Wilco tests in BVE lab.
-
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
- 'labels': ['wilco_bve'],
- 'owner': '',
- 'status': None,
- 'summary': None,
- 'title': None,
- 'cc': ['chromeos-ent-test@google.com']
-}
-
-args_dict['name'] = NAME
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
\ No newline at end of file
diff --git a/test_suites/control.wilco_bve_dock b/test_suites/control.wilco_bve_dock
deleted file mode 100644
index 042d38e..0000000
--- a/test_suites/control.wilco_bve_dock
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright (c) 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.
-
-AUTHOR = "Ruben Zakarian <rzakarian@chromium.org>"
-NAME = "wilco_bve_dock"
-PURPOSE = "Suite for automated Wilco on device with a dock."
-
-TIME = "LONG"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "suite"
-TEST_TYPE = "server"
-
-DOC = """
-This suite runs the set of Wilco tests that require a dock.
-
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-# Values specified in this bug template will override default values when
-# filing bugs on tests that are a part of this suite. If left unspecified
-# the bug filer will fallback to it's defaults.
-_BUG_TEMPLATE = {
- 'labels': ['wilco_bve_dock'],
- 'owner': '',
- 'status': None,
- 'summary': None,
- 'title': None,
- 'cc': ['chromeos-ent-test@google.com']
-}
-
-args_dict['name'] = NAME
-args_dict['add_experimental'] = True
-args_dict['bug_template'] = _BUG_TEMPLATE
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
\ No newline at end of file
diff --git a/test_suites/control.youtube_mse_eme b/test_suites/control.youtube_mse_eme
deleted file mode 100644
index 8106fe7..0000000
--- a/test_suites/control.youtube_mse_eme
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright (c) 2013 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.
-
-AUTHOR = "dunno@chromium.org"
-NAME = "youtube_mse_eme"
-PURPOSE = "Verify that YouTube page HTML5 MSE/EME works"
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This test verifies HTML5 MSE/EME correctness.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-@param file_bugs: If True your suite will file bugs on failures.
-@param max_run_time: Amount of time each test shoud run in minutes.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['add_experimental'] = True
-args_dict['max_runtime_mins'] = 60
-args_dict['name'] = NAME
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)
diff --git a/test_suites/control.youtube_page b/test_suites/control.youtube_page
deleted file mode 100644
index cf8f21f..0000000
--- a/test_suites/control.youtube_page
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright (c) 2013 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.
-
-AUTHOR = "dunno@chromium.org"
-NAME = "youtube_page"
-PURPOSE = "Verify that YouTube page HTML5 video works"
-
-TIME = "SHORT"
-TEST_CATEGORY = "General"
-TEST_CLASS = "suite"
-TEST_TYPE = "Server"
-
-DOC = """
-This test verify YouTube page video playback, states and resolutions.
-
-@param build: The name of the image to test.
- Ex: x86-mario-release/R17-1412.33.0-a1-b29
-@param board: The board to test on. Ex: x86-mario
-@param pool: The pool of machines to utilize for scheduling. If pool=None
- board is used.
-@param check_hosts: require appropriate live hosts to exist in the lab.
-@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
-@param file_bugs: If True your suite will file bugs on failures.
-@param max_run_time: Amount of time each test shoud run in minutes.
-"""
-
-import common
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
-
-args_dict['name'] = 'youtube_page'
-args_dict['add_experimental'] = True
-args_dict['max_runtime_mins'] = 60
-args_dict['job'] = job
-
-dynamic_suite.reimage_and_run(**args_dict)