Remove tests that have been failing for more than 7 days.
All tests being removed have not passed once for at least 7 days.
A full list can be viewed at go/chromeos-lab-disabled
The following suites have also been disabled as they no longer have
tests in them or are deprecated.
* onccell
The below have been deprecated in favor of perf_v2.
* pyauto
* pyauto_perf
* pyauto_basic
* sync
* browsertests
* faft_normal
* faft_dev
* wifi_flaky
TEST=suite_scheduler checks
BUG=chromium:312742
Change-Id: I97a97b05a5168b28fcdbc7c7fad5c4ee34516995
Reviewed-on: https://chromium-review.googlesource.com/174687
Tested-by: Scott Zawalski <scottz@chromium.org>
Reviewed-by: Prashanth B <beeps@chromium.org>
Reviewed-by: Scott Zawalski <scottz@chromium.org>
Commit-Queue: Scott Zawalski <scottz@chromium.org>
diff --git a/client/site_tests/desktopui_DocViewing/control b/client/site_tests/desktopui_DocViewing/control
index 8665a14..94dbaee 100644
--- a/client/site_tests/desktopui_DocViewing/control
+++ b/client/site_tests/desktopui_DocViewing/control
@@ -10,7 +10,6 @@
TEST_CATEGORY = "Functional"
TEST_CLASS = "desktopui"
TEST_TYPE = "client"
-SUITE = "regression"
DOC = """
Tests for viewing Office documents in File Manager.
diff --git a/client/site_tests/desktopui_NaClSanity/control b/client/site_tests/desktopui_NaClSanity/control
index fc202d7..084cd08 100644
--- a/client/site_tests/desktopui_NaClSanity/control
+++ b/client/site_tests/desktopui_NaClSanity/control
@@ -10,7 +10,6 @@
TEST_CATEGORY = "Functional"
TEST_CLASS = "desktopui"
TEST_TYPE = "client"
-SUITE = "regression"
DOC = """
Sanity test for Native Client (NaCl).
diff --git a/client/site_tests/enterprise_DevicePolicy/control b/client/site_tests/enterprise_DevicePolicy/control
index 74a0b97..32ffe25 100644
--- a/client/site_tests/enterprise_DevicePolicy/control
+++ b/client/site_tests/enterprise_DevicePolicy/control
@@ -10,7 +10,6 @@
TEST_CATEGORY = "Functional"
TEST_CLASS = "desktopui"
TEST_TYPE = "client"
-SUITE = "regression"
DOC = """
Tests for device policy.
diff --git a/client/site_tests/enterprise_InstallAttributes/control b/client/site_tests/enterprise_InstallAttributes/control
index 871aeb2..818ac8f 100755
--- a/client/site_tests/enterprise_InstallAttributes/control
+++ b/client/site_tests/enterprise_InstallAttributes/control
@@ -6,7 +6,6 @@
NAME = "enterprise_InstallAttributes"
PURPOSE = "Enterprise install_attributes.pb file creation."
CRITERIA = "Install attributes file is properly created when device is owned."
-SUITE = "regression"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "Enterprise"
diff --git a/client/site_tests/network_3GDisableWhileConnecting/control.e362 b/client/site_tests/network_3GDisableWhileConnecting/control.e362
index 3626043..0aa6e4e 100644
--- a/client/site_tests/network_3GDisableWhileConnecting/control.e362
+++ b/client/site_tests/network_3GDisableWhileConnecting/control.e362
@@ -9,7 +9,6 @@
This test will fail if a disconnect request while the modem is
connecting is not promptly executed.
"""
-SUITE = "network3g"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "network"
diff --git a/client/site_tests/network_3GIdentifiers/control.e362 b/client/site_tests/network_3GIdentifiers/control.e362
index a51e500..f19cc64 100644
--- a/client/site_tests/network_3GIdentifiers/control.e362
+++ b/client/site_tests/network_3GIdentifiers/control.e362
@@ -13,7 +13,6 @@
TEST_CATEGORY = "Functional"
TEST_CLASS = "network"
TEST_TYPE = "client"
-SUITE = "network3g"
DEPENDENCIES = "modem:e362"
DOC = """
Tests that a cellular modem provides correct identification information
diff --git a/client/site_tests/network_3GModemControl/control.e362 b/client/site_tests/network_3GModemControl/control.e362
index 26489c0..af739dc 100644
--- a/client/site_tests/network_3GModemControl/control.e362
+++ b/client/site_tests/network_3GModemControl/control.e362
@@ -8,7 +8,6 @@
CRITERIA = """
This test will fail if modem manager state differs from flimflam state.
"""
-SUITE = "network3g"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "network"
diff --git a/client/site_tests/network_3GModemControl/control.mu736 b/client/site_tests/network_3GModemControl/control.mu736
index 9c1c67e..4696266 100644
--- a/client/site_tests/network_3GModemControl/control.mu736
+++ b/client/site_tests/network_3GModemControl/control.mu736
@@ -8,7 +8,6 @@
CRITERIA = """
This test will fail if modem manager state differs from flimflam state.
"""
-SUITE = "network3g"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "network"
diff --git a/client/site_tests/network_3GSafetyDance/control.e362 b/client/site_tests/network_3GSafetyDance/control.e362
index d987223..85d9cd5 100644
--- a/client/site_tests/network_3GSafetyDance/control.e362
+++ b/client/site_tests/network_3GSafetyDance/control.e362
@@ -8,7 +8,6 @@
CRITERIA = """
This test will fail if any DBus call times out or flimflam crashes.
"""
-SUITE = "network3g"
TIME = "SHORT"
TEST_CATEGORY = "Stress"
TEST_CLASS = "network"
diff --git a/client/site_tests/network_3GSafetyDance/control.mu736 b/client/site_tests/network_3GSafetyDance/control.mu736
index 286162d..de4165d 100644
--- a/client/site_tests/network_3GSafetyDance/control.mu736
+++ b/client/site_tests/network_3GSafetyDance/control.mu736
@@ -8,7 +8,6 @@
CRITERIA = """
This test will fail if any DBus call times out or flimflam crashes.
"""
-SUITE = "network3g"
TIME = "SHORT"
TEST_CATEGORY = "Stress"
TEST_CLASS = "network"
diff --git a/client/site_tests/network_3GSmokeTest/control.e362 b/client/site_tests/network_3GSmokeTest/control.e362
index dbbd940..9b684fc 100644
--- a/client/site_tests/network_3GSmokeTest/control.e362
+++ b/client/site_tests/network_3GSmokeTest/control.e362
@@ -14,7 +14,6 @@
TEST_CATEGORY = "Functional"
TEST_CLASS = "network"
TEST_TYPE = "client"
-SUITE = "network3g"
DEPENDENCIES = "modem:e362"
DOC = """
Tests that 3G modem can connect to the network
diff --git a/client/site_tests/network_3GSmokeTest/control.mu736 b/client/site_tests/network_3GSmokeTest/control.mu736
index f5d4b87..603914f 100644
--- a/client/site_tests/network_3GSmokeTest/control.mu736
+++ b/client/site_tests/network_3GSmokeTest/control.mu736
@@ -14,7 +14,6 @@
TEST_CATEGORY = "Functional"
TEST_CLASS = "network"
TEST_TYPE = "client"
-SUITE = "network3g"
DEPENDENCIES = "modem:mu736"
DOC = """
Tests that 3G modem can connect to the network
diff --git a/client/site_tests/network_MobileSuspendResume/control.alt3100 b/client/site_tests/network_MobileSuspendResume/control.alt3100
index aee9cfc..0701114 100644
--- a/client/site_tests/network_MobileSuspendResume/control.alt3100
+++ b/client/site_tests/network_MobileSuspendResume/control.alt3100
@@ -11,7 +11,6 @@
Verify that if autoconnect is turned on that the modem autoconnects
after resuming.
"""
-SUITE = "network3g"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "network"
diff --git a/client/site_tests/network_MobileSuspendResume/control.e362 b/client/site_tests/network_MobileSuspendResume/control.e362
index 1445479..3bc8b26 100644
--- a/client/site_tests/network_MobileSuspendResume/control.e362
+++ b/client/site_tests/network_MobileSuspendResume/control.e362
@@ -11,7 +11,6 @@
Verify that if autoconnect is turned on that the modem autoconnects
after resuming.
"""
-SUITE = "network3g"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "network"
diff --git a/client/site_tests/network_MobileSuspendResume/control.mu736 b/client/site_tests/network_MobileSuspendResume/control.mu736
index 4b0e7a1..47f678c 100644
--- a/client/site_tests/network_MobileSuspendResume/control.mu736
+++ b/client/site_tests/network_MobileSuspendResume/control.mu736
@@ -11,7 +11,6 @@
Verify that if autoconnect is turned on that the modem autoconnects
after resuming.
"""
-SUITE = "network3g"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "network"
diff --git a/client/site_tests/realtimecomm_GTalkAudioPlayground/control.hwqual b/client/site_tests/realtimecomm_GTalkAudioPlayground/control.hwqual
index e7273ae..62a2fd4 100755
--- a/client/site_tests/realtimecomm_GTalkAudioPlayground/control.hwqual
+++ b/client/site_tests/realtimecomm_GTalkAudioPlayground/control.hwqual
@@ -6,7 +6,6 @@
NAME = "realtimecomm_GTalkPlayground with performance constraints"
PURPOSE = "Verify that Google Talk Plugin Audio works with Chrome."
CRITERIA = "Fails if there is an error sending or receiving audio."
-SUITE = "hwqual"
TIME = "MEDIUM"
TEST_CATEGORY = "GTalk"
TEST_CLASS = "realtimecomm"
diff --git a/client/site_tests/realtimecomm_GTalkPlayground/control.hwqual b/client/site_tests/realtimecomm_GTalkPlayground/control.hwqual
index 13ce6a8..12bc3f0 100755
--- a/client/site_tests/realtimecomm_GTalkPlayground/control.hwqual
+++ b/client/site_tests/realtimecomm_GTalkPlayground/control.hwqual
@@ -11,7 +11,6 @@
- the number of video streams is not 2
- the video framerate is less than 5 fps
"""
-SUITE = "hwqual"
TIME = "MEDIUM"
TEST_CATEGORY = "GTalk"
TEST_CLASS = "realtimecomm"
diff --git a/client/site_tests/security_SandboxStatusBrowserTest/control b/client/site_tests/security_SandboxStatusBrowserTest/control
index 6ca7b7c..67d6d26 100644
--- a/client/site_tests/security_SandboxStatusBrowserTest/control
+++ b/client/site_tests/security_SandboxStatusBrowserTest/control
@@ -4,7 +4,6 @@
AUTHOR = "The Chromium OS Authors"
NAME = "security_SandboxStatusBrowserTest"
-SUITE = "security"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "security"
diff --git a/client/site_tests/video_YouTubeMseEme/control.add_source_buffer b/client/site_tests/video_YouTubeMseEme/control.add_source_buffer
index 088f7cd..f6ff74c 100644
--- a/client/site_tests/video_YouTubeMseEme/control.add_source_buffer
+++ b/client/site_tests/video_YouTubeMseEme/control.add_source_buffer
@@ -8,7 +8,6 @@
CRITERIA = """
This test will fail if valid source buffers can't be added to MSE.
"""
-SUITE = "youtube_mse_eme"
TIME = "SHORT"
TEST_CATEGORY = "General"
TEST_CLASS = "video"
diff --git a/client/site_tests/video_YouTubeMseEme/control.add_supported_formats b/client/site_tests/video_YouTubeMseEme/control.add_supported_formats
index a87f480..ac0dd05 100644
--- a/client/site_tests/video_YouTubeMseEme/control.add_supported_formats
+++ b/client/site_tests/video_YouTubeMseEme/control.add_supported_formats
@@ -8,7 +8,6 @@
CRITERIA = """
This test will fail if known supported formats can't be added to MSE.
"""
-SUITE = "youtube_mse_eme"
TIME = "SHORT"
TEST_CATEGORY = "General"
TEST_CLASS = "video"
diff --git a/client/site_tests/video_YouTubeMseEme/control.attach_source b/client/site_tests/video_YouTubeMseEme/control.attach_source
index 66b55da..74d6b1d 100644
--- a/client/site_tests/video_YouTubeMseEme/control.attach_source
+++ b/client/site_tests/video_YouTubeMseEme/control.attach_source
@@ -8,7 +8,6 @@
CRITERIA = """
This test will fail if Media Source can not be attached.
"""
-SUITE = "youtube_mse_eme"
TIME = "SHORT"
TEST_CATEGORY = "General"
TEST_CLASS = "video"
diff --git a/client/site_tests/video_YouTubeMseEme/control.can_play_clear_key b/client/site_tests/video_YouTubeMseEme/control.can_play_clear_key
index 9e09aff..c06fe62 100644
--- a/client/site_tests/video_YouTubeMseEme/control.can_play_clear_key
+++ b/client/site_tests/video_YouTubeMseEme/control.can_play_clear_key
@@ -8,7 +8,6 @@
CRITERIA = """
This test will fail if the browser can not play Clear Key videos.
"""
-SUITE = "youtube_mse_eme"
TIME = "SHORT"
TEST_CATEGORY = "General"
TEST_CLASS = "video"
diff --git a/client/site_tests/video_YouTubeMseEme/control.can_play_webm b/client/site_tests/video_YouTubeMseEme/control.can_play_webm
index 9551189..080cdbc 100644
--- a/client/site_tests/video_YouTubeMseEme/control.can_play_webm
+++ b/client/site_tests/video_YouTubeMseEme/control.can_play_webm
@@ -8,7 +8,6 @@
CRITERIA = """
This test will fail if WebM containers can't be played.
"""
-SUITE = "youtube_mse_eme"
TIME = "SHORT"
TEST_CATEGORY = "General"
TEST_CLASS = "video"
diff --git a/client/site_tests/video_YouTubeMseEme/control.duration b/client/site_tests/video_YouTubeMseEme/control.duration
index 9502641..32d1970 100644
--- a/client/site_tests/video_YouTubeMseEme/control.duration
+++ b/client/site_tests/video_YouTubeMseEme/control.duration
@@ -8,7 +8,6 @@
CRITERIA = """
This test will fail if the media source duration doesn't match specified time.
"""
-SUITE = "youtube_mse_eme"
TIME = "SHORT"
TEST_CATEGORY = "General"
TEST_CLASS = "video"
diff --git a/client/site_tests/video_YouTubeMseEme/control.duration_after_append b/client/site_tests/video_YouTubeMseEme/control.duration_after_append
index e03ebd5..40913d8 100644
--- a/client/site_tests/video_YouTubeMseEme/control.duration_after_append
+++ b/client/site_tests/video_YouTubeMseEme/control.duration_after_append
@@ -9,7 +9,6 @@
This test will fail if media source duration after appending to the source
buffer is incorrect.
"""
-SUITE = "youtube_mse_eme"
TIME = "SHORT"
TEST_CATEGORY = "General"
TEST_CLASS = "video"
diff --git a/client/site_tests/video_YouTubeMseEme/control.initial_media_source_state b/client/site_tests/video_YouTubeMseEme/control.initial_media_source_state
index 44eba80..ab3cd14 100644
--- a/client/site_tests/video_YouTubeMseEme/control.initial_media_source_state
+++ b/client/site_tests/video_YouTubeMseEme/control.initial_media_source_state
@@ -9,7 +9,6 @@
This test will fail if the browser's initial MSE/EME Media Source state doesn't
conform to the standards.
"""
-SUITE = "youtube_mse_eme"
TIME = "SHORT"
TEST_CATEGORY = "General"
TEST_CLASS = "video"
diff --git a/client/site_tests/video_YouTubePage/control.last_second b/client/site_tests/video_YouTubePage/control.last_second
index 8723dd6..277fe47 100644
--- a/client/site_tests/video_YouTubePage/control.last_second
+++ b/client/site_tests/video_YouTubePage/control.last_second
@@ -9,7 +9,6 @@
This test will fail if YouTube page HTML5 video fails to continuously play the
last second of the video.
"""
-SUITE = "youtube_page"
TIME = "SHORT"
TEST_CATEGORY = "General"
TEST_CLASS = "video"
diff --git a/client/site_tests/video_YouTubePage/control.pausing b/client/site_tests/video_YouTubePage/control.pausing
index 4a44aae..0c47ac3 100644
--- a/client/site_tests/video_YouTubePage/control.pausing
+++ b/client/site_tests/video_YouTubePage/control.pausing
@@ -9,7 +9,6 @@
This test will fail if YouTube page HTML5 video fails to be in the 'paused'
state.
"""
-SUITE = "youtube_page"
TIME = "SHORT"
TEST_CATEGORY = "General"
TEST_CLASS = "video"
diff --git a/client/site_tests/video_YouTubePage/control.playing b/client/site_tests/video_YouTubePage/control.playing
index 80d44d3..0b2306a 100644
--- a/client/site_tests/video_YouTubePage/control.playing
+++ b/client/site_tests/video_YouTubePage/control.playing
@@ -9,7 +9,6 @@
This test will fail if YouTube page HTML5 video fails to be in the 'playing'
state.
"""
-SUITE = "youtube_page"
TIME = "SHORT"
TEST_CATEGORY = "General"
TEST_CLASS = "video"
diff --git a/client/site_tests/video_YouTubePage/control.resuming b/client/site_tests/video_YouTubePage/control.resuming
index a4be72f..7ce42b8 100644
--- a/client/site_tests/video_YouTubePage/control.resuming
+++ b/client/site_tests/video_YouTubePage/control.resuming
@@ -9,7 +9,6 @@
This test will fail if YouTube page HTML5 video fails to be in the 'playing'
state.
"""
-SUITE = "youtube_page"
TIME = "SHORT"
TEST_CATEGORY = "General"
TEST_CLASS = "video"
diff --git a/server/site_tests/firmware_CgptState/control b/server/site_tests/firmware_CgptState/control
index d81eb9d..b74dbaa 100644
--- a/server/site_tests/firmware_CgptState/control
+++ b/server/site_tests/firmware_CgptState/control
@@ -8,7 +8,6 @@
NAME = "firmware_CgptState"
PURPOSE = "Servo based executing the CgptState test on client side."
CRITERIA = "This test will fail if cgpt mis-behaves"
-SUITE = "faft,faft_bios,faft_normal,faft_lv4"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_CgptStress/control b/server/site_tests/firmware_CgptStress/control
index c50bd86..1d5c5a6 100644
--- a/server/site_tests/firmware_CgptStress/control
+++ b/server/site_tests/firmware_CgptStress/control
@@ -8,7 +8,6 @@
NAME = "firmware_CgptStress"
PURPOSE = "Servo based cgpt stress test"
CRITERIA = "This test will fail if changing cgpt fails to switch kernel"
-SUITE = "faft,faft_stress,faft_normal"
TIME = "SHORT"
TEST_CATEGORY = "Stress"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_CgptStress/control.dev b/server/site_tests/firmware_CgptStress/control.dev
index abf0c81..812bb19 100644
--- a/server/site_tests/firmware_CgptStress/control.dev
+++ b/server/site_tests/firmware_CgptStress/control.dev
@@ -8,7 +8,6 @@
NAME = "firmware_CgptStress"
PURPOSE = "Servo based cgpt stress test"
CRITERIA = "This test will fail if changing cgpt fails to switch kernel"
-SUITE = "faft,faft_stress,faft_dev"
TIME = "SHORT"
TEST_CATEGORY = "Stress"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_ConsecutiveBoot/control b/server/site_tests/firmware_ConsecutiveBoot/control
index 9742118..10d41e0 100644
--- a/server/site_tests/firmware_ConsecutiveBoot/control
+++ b/server/site_tests/firmware_ConsecutiveBoot/control
@@ -8,7 +8,6 @@
NAME = "firmware_ConsecutiveBoot"
PURPOSE = "Servo based consecutive boot test"
CRITERIA = "This test will fail if DUT fails to boot from power-off"
-SUITE = "faft,faft_stress,faft_normal"
TIME = "SHORT"
TEST_CATEGORY = "Stress"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_ConsecutiveBoot/control.dev b/server/site_tests/firmware_ConsecutiveBoot/control.dev
index 0e77386..4791bbd 100644
--- a/server/site_tests/firmware_ConsecutiveBoot/control.dev
+++ b/server/site_tests/firmware_ConsecutiveBoot/control.dev
@@ -8,7 +8,6 @@
NAME = "firmware_ConsecutiveBoot"
PURPOSE = "Servo based consecutive boot test"
CRITERIA = "This test will fail if DUT fails to boot from power-off"
-SUITE = "faft,faft_stress,faft_dev"
TIME = "SHORT"
TEST_CATEGORY = "Stress"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_CorruptBothFwBodyAB/control b/server/site_tests/firmware_CorruptBothFwBodyAB/control
index 4167768..b74c0af 100644
--- a/server/site_tests/firmware_CorruptBothFwBodyAB/control
+++ b/server/site_tests/firmware_CorruptBothFwBodyAB/control
@@ -8,7 +8,6 @@
NAME = "firmware_CorruptBothFwBodyAB"
PURPOSE = "Servo based both firmware body A and B corruption test"
CRITERIA = "This test will fail if firmware does not enter recovery mode"
-SUITE = "faft,faft_bios,faft_normal,faft_lv3"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_CorruptBothFwBodyAB/control.dev b/server/site_tests/firmware_CorruptBothFwBodyAB/control.dev
index 8bc1f4d..9a818f4 100644
--- a/server/site_tests/firmware_CorruptBothFwBodyAB/control.dev
+++ b/server/site_tests/firmware_CorruptBothFwBodyAB/control.dev
@@ -8,7 +8,6 @@
NAME = "firmware_CorruptBothFwBodyAB"
PURPOSE = "Servo based both firmware body A and B corruption test"
CRITERIA = "This test will fail if firmware does not enter recovery mode"
-SUITE = "faft,faft_bios,faft_dev,faft_lv3"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_CorruptBothFwSigAB/control b/server/site_tests/firmware_CorruptBothFwSigAB/control
index 722fe55..7348e01 100644
--- a/server/site_tests/firmware_CorruptBothFwSigAB/control
+++ b/server/site_tests/firmware_CorruptBothFwSigAB/control
@@ -8,7 +8,6 @@
NAME = "firmware_CorruptBothFwSigAB"
PURPOSE = "Servo based both firmware signature A and B corruption test"
CRITERIA = "This test will fail if firmware does not enter recovery mode"
-SUITE = "faft,faft_bios,faft_normal,faft_lv3"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_CorruptBothFwSigAB/control.dev b/server/site_tests/firmware_CorruptBothFwSigAB/control.dev
index 112efbd..91d7711 100644
--- a/server/site_tests/firmware_CorruptBothFwSigAB/control.dev
+++ b/server/site_tests/firmware_CorruptBothFwSigAB/control.dev
@@ -8,7 +8,6 @@
NAME = "firmware_CorruptBothFwSigAB"
PURPOSE = "Servo based both firmware signature A and B corruption test"
CRITERIA = "This test will fail if firmware does not enter recovery mode"
-SUITE = "faft,faft_bios,faft_dev,faft_lv3"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_CorruptBothKernelAB/control b/server/site_tests/firmware_CorruptBothKernelAB/control
index b750e31..a541787 100644
--- a/server/site_tests/firmware_CorruptBothKernelAB/control
+++ b/server/site_tests/firmware_CorruptBothKernelAB/control
@@ -8,7 +8,6 @@
NAME = "firmware_CorruptBothKernelAB"
PURPOSE = "Servo based both kernel A and B corruption test"
CRITERIA = "This test will fail if firmware does not enter recovery mode"
-SUITE = "faft,faft_bios,faft_normal,faft_lv3"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_CorruptBothKernelAB/control.dev b/server/site_tests/firmware_CorruptBothKernelAB/control.dev
index df5ea5b..42ba887 100644
--- a/server/site_tests/firmware_CorruptBothKernelAB/control.dev
+++ b/server/site_tests/firmware_CorruptBothKernelAB/control.dev
@@ -8,7 +8,6 @@
NAME = "firmware_CorruptBothKernelAB"
PURPOSE = "Servo based both kernel A and B corruption test"
CRITERIA = "This test will fail if firmware does not enter recovery mode"
-SUITE = "faft,faft_bios,faft_dev,faft_lv3"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_CorruptFwBodyA/control b/server/site_tests/firmware_CorruptFwBodyA/control
index 255365f..a4d6df2 100644
--- a/server/site_tests/firmware_CorruptFwBodyA/control
+++ b/server/site_tests/firmware_CorruptFwBodyA/control
@@ -8,7 +8,6 @@
NAME = "firmware_CorruptFwBodyA"
PURPOSE = "Servo based firmware A body corruption test"
CRITERIA = "This test will fail if firmware verification mis-behaved"
-SUITE = "faft,faft_bios,faft_normal,faft_lv3"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_CorruptFwBodyA/control.dev b/server/site_tests/firmware_CorruptFwBodyA/control.dev
index 958de1e..d6becde 100644
--- a/server/site_tests/firmware_CorruptFwBodyA/control.dev
+++ b/server/site_tests/firmware_CorruptFwBodyA/control.dev
@@ -8,7 +8,6 @@
NAME = "firmware_CorruptFwBodyA"
PURPOSE = "Servo based firmware A body corruption test"
CRITERIA = "This test will fail if firmware verification mis-behaved"
-SUITE = "faft,faft_bios,faft_dev,faft_lv3"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_CorruptFwBodyB/control b/server/site_tests/firmware_CorruptFwBodyB/control
index a8d6dbe..ed7d3bf 100644
--- a/server/site_tests/firmware_CorruptFwBodyB/control
+++ b/server/site_tests/firmware_CorruptFwBodyB/control
@@ -8,7 +8,6 @@
NAME = "firmware_CorruptFwBodyB"
PURPOSE = "Servo based firmware B body corruption test"
CRITERIA = "This test will fail if firmware verification mis-behaved"
-SUITE = "faft,faft_bios,faft_normal,faft_lv3"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_CorruptFwBodyB/control.dev b/server/site_tests/firmware_CorruptFwBodyB/control.dev
index 95792e4..3c8d43c 100644
--- a/server/site_tests/firmware_CorruptFwBodyB/control.dev
+++ b/server/site_tests/firmware_CorruptFwBodyB/control.dev
@@ -8,7 +8,6 @@
NAME = "firmware_CorruptFwBodyB"
PURPOSE = "Servo based firmware B body corruption test"
CRITERIA = "This test will fail if firmware verification mis-behaved"
-SUITE = "faft,faft_bios,faft_dev,faft_lv3"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_CorruptFwSigA/control b/server/site_tests/firmware_CorruptFwSigA/control
index 0f4a335..9f3dc6f 100644
--- a/server/site_tests/firmware_CorruptFwSigA/control
+++ b/server/site_tests/firmware_CorruptFwSigA/control
@@ -8,7 +8,6 @@
NAME = "firmware_CorruptFwSigA"
PURPOSE = "Servo based firmware A signature corruption test"
CRITERIA = "This test will fail if firmware verification mis-behaved"
-SUITE = "faft,faft_bios,faft_normal,faft_lv3"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_CorruptFwSigA/control.dev b/server/site_tests/firmware_CorruptFwSigA/control.dev
index 3f04641..1e616d2 100644
--- a/server/site_tests/firmware_CorruptFwSigA/control.dev
+++ b/server/site_tests/firmware_CorruptFwSigA/control.dev
@@ -8,7 +8,6 @@
NAME = "firmware_CorruptFwSigA"
PURPOSE = "Servo based firmware A signature corruption test"
CRITERIA = "This test will fail if firmware verification mis-behaved"
-SUITE = "faft,faft_bios,faft_dev,faft_lv3"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_CorruptFwSigB/control b/server/site_tests/firmware_CorruptFwSigB/control
index 591410f..dff9271 100644
--- a/server/site_tests/firmware_CorruptFwSigB/control
+++ b/server/site_tests/firmware_CorruptFwSigB/control
@@ -8,7 +8,6 @@
NAME = "firmware_CorruptFwSigB"
PURPOSE = "Servo based firmware signature B corruption test"
CRITERIA = "This test will fail if firmware verification mis-behaved"
-SUITE = "faft,faft_bios,faft_normal,faft_lv3"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_CorruptFwSigB/control.dev b/server/site_tests/firmware_CorruptFwSigB/control.dev
index fa98972..0cd28bb 100644
--- a/server/site_tests/firmware_CorruptFwSigB/control.dev
+++ b/server/site_tests/firmware_CorruptFwSigB/control.dev
@@ -8,7 +8,6 @@
NAME = "firmware_CorruptFwSigB"
PURPOSE = "Servo based firmware signature B corruption test"
CRITERIA = "This test will fail if firmware verification mis-behaved"
-SUITE = "faft,faft_bios,faft_dev,faft_lv3"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_CorruptKernelA/control b/server/site_tests/firmware_CorruptKernelA/control
index 9f8423c..e5c99df 100644
--- a/server/site_tests/firmware_CorruptKernelA/control
+++ b/server/site_tests/firmware_CorruptKernelA/control
@@ -8,7 +8,6 @@
NAME = "firmware_CorruptKernelA"
PURPOSE = "Servo based kernel A corruption test"
CRITERIA = "This test will fail if kernel verification mis-behaved"
-SUITE = "faft,faft_bios,faft_normal,faft_lv3"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_CorruptKernelA/control.dev b/server/site_tests/firmware_CorruptKernelA/control.dev
index 943ecbe..200a269 100644
--- a/server/site_tests/firmware_CorruptKernelA/control.dev
+++ b/server/site_tests/firmware_CorruptKernelA/control.dev
@@ -8,7 +8,6 @@
NAME = "firmware_CorruptKernelA"
PURPOSE = "Servo based kernel A corruption test"
CRITERIA = "This test will fail if kernel verification mis-behaved"
-SUITE = "faft,faft_bios,faft_dev,faft_lv3"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_CorruptKernelB/control b/server/site_tests/firmware_CorruptKernelB/control
index ca47d79..81a4cb1 100644
--- a/server/site_tests/firmware_CorruptKernelB/control
+++ b/server/site_tests/firmware_CorruptKernelB/control
@@ -8,7 +8,6 @@
NAME = "firmware_CorruptKernelB"
PURPOSE = "Servo based kernel B corruption test"
CRITERIA = "This test will fail if kernel verification mis-behaved"
-SUITE = "faft,faft_bios,faft_normal,faft_lv3"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_CorruptKernelB/control.dev b/server/site_tests/firmware_CorruptKernelB/control.dev
index 68872e8..6ce4e05 100644
--- a/server/site_tests/firmware_CorruptKernelB/control.dev
+++ b/server/site_tests/firmware_CorruptKernelB/control.dev
@@ -8,7 +8,6 @@
NAME = "firmware_CorruptKernelB"
PURPOSE = "Servo based kernel B corruption test"
CRITERIA = "This test will fail if kernel verification mis-behaved"
-SUITE = "faft,faft_bios,faft_dev,faft_lv3"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_DevBootUSB/control b/server/site_tests/firmware_DevBootUSB/control
index 675e6c7..bd95fa6 100644
--- a/server/site_tests/firmware_DevBootUSB/control
+++ b/server/site_tests/firmware_DevBootUSB/control
@@ -8,7 +8,6 @@
NAME = "firmware_DevBootUSB"
PURPOSE = "Press Ctrl-U on developer screen to boot USB disk"
CRITERIA = "This test will fail if firmware does not boot USB disk"
-SUITE = "faft,faft_bios,faft_dev,faft_lv2"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_DevFwNormalBoot/control b/server/site_tests/firmware_DevFwNormalBoot/control
index 39b19f4..03f59a2 100644
--- a/server/site_tests/firmware_DevFwNormalBoot/control
+++ b/server/site_tests/firmware_DevFwNormalBoot/control
@@ -8,7 +8,6 @@
NAME = "firmware_DevFwNormalBoot"
PURPOSE = "Servo based test forcing normal boot on dev firmware"
CRITERIA = "This test will fail if firmware does not enter recovery mode"
-SUITE = "faft,faft_bios,faft_dev,faft_lv3"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_DevMode/control b/server/site_tests/firmware_DevMode/control
index 70ce842..e61467b 100644
--- a/server/site_tests/firmware_DevMode/control
+++ b/server/site_tests/firmware_DevMode/control
@@ -8,7 +8,6 @@
NAME = "firmware_DevMode"
PURPOSE = "Servo based developer firmware boot test"
CRITERIA = "This test will fail if firmware does not switch to developer mode"
-SUITE = "faft,faft_bios,faft_normal,faft_lv1"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_DevMode/control.ec_wp b/server/site_tests/firmware_DevMode/control.ec_wp
index bf99ce9..0d65dba 100644
--- a/server/site_tests/firmware_DevMode/control.ec_wp
+++ b/server/site_tests/firmware_DevMode/control.ec_wp
@@ -8,7 +8,6 @@
NAME = "firmware_DevMode"
PURPOSE = "Servo based developer firmware boot test"
CRITERIA = "This test will fail if firmware does not switch to developer mode"
-SUITE = "faft,faft_bios,faft_normal,faft_ec_wp,faft_lv1"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_DevModeStress/control b/server/site_tests/firmware_DevModeStress/control
index 42554d5..551ae52 100644
--- a/server/site_tests/firmware_DevModeStress/control
+++ b/server/site_tests/firmware_DevModeStress/control
@@ -8,7 +8,6 @@
NAME = "firmware_DevModeStress"
PURPOSE = "Servo based developer firmware boot test"
CRITERIA = "This test will fail if firmware does not remain in developer mode"
-SUITE = "faft,faft_stress,faft_dev"
TIME = "SHORT"
TEST_CATEGORY = "Stress"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_DevScreenTimeout/control b/server/site_tests/firmware_DevScreenTimeout/control
index b30bb88..c653794 100644
--- a/server/site_tests/firmware_DevScreenTimeout/control
+++ b/server/site_tests/firmware_DevScreenTimeout/control
@@ -8,7 +8,6 @@
NAME = "firmware_DevScreenTimeout"
PURPOSE = "Servo based developer firmware screen timeout test"
CRITERIA = "This test will fail if the timeout period does not match our spec."
-SUITE = "faft,faft_bios,faft_dev,faft_lv4"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_DevTriggerRecovery/control b/server/site_tests/firmware_DevTriggerRecovery/control
index c9eab3e..35d5db6 100644
--- a/server/site_tests/firmware_DevTriggerRecovery/control
+++ b/server/site_tests/firmware_DevTriggerRecovery/control
@@ -8,7 +8,6 @@
NAME = "firmware_DevTriggerRecovery"
PURPOSE = "Servo based recovery boot triggered by pressing a key at dev screen"
CRITERIA = "This test will fail if firmware does not enter recovery mode"
-SUITE = "faft,faft_bios,faft_normal,faft_lv2"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_FAFTSetup/control b/server/site_tests/firmware_FAFTSetup/control
index 97dfd87..5dcbc0a 100644
--- a/server/site_tests/firmware_FAFTSetup/control
+++ b/server/site_tests/firmware_FAFTSetup/control
@@ -8,7 +8,6 @@
NAME = "firmware_FAFTSetup"
PURPOSE = "Servo based diagnose of FAFT hardware setup"
CRITERIA = "This test will fail if FAFT hardware is not set up correctly."
-SUITE = "faft,faft_bios,faft_normal,faft_lv2,faft_lab"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_FwScreenCloseLid/control b/server/site_tests/firmware_FwScreenCloseLid/control
index 52dad94..1139e8f 100644
--- a/server/site_tests/firmware_FwScreenCloseLid/control
+++ b/server/site_tests/firmware_FwScreenCloseLid/control
@@ -8,7 +8,6 @@
NAME = "firmware_FwScreenCloseLid"
PURPOSE = "Servo based lid close triggered shutdown during firmware screens."
CRITERIA = "This test will fail if DUT doesn't shutdown"
-SUITE = "faft,faft_bios,faft_dev,faft_lv4"
TIME = "MEDIUM"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_FwScreenPressPower/control b/server/site_tests/firmware_FwScreenPressPower/control
index 50b8b18..9dec75f 100644
--- a/server/site_tests/firmware_FwScreenPressPower/control
+++ b/server/site_tests/firmware_FwScreenPressPower/control
@@ -8,7 +8,6 @@
NAME = "firmware_FwScreenPressPower"
PURPOSE = "Servo based power button triggered shutdown during firmware screens."
CRITERIA = "This test will fail if DUT doesn't shutdown"
-SUITE = "faft,faft_bios,faft_dev,faft_lv4"
TIME = "MEDIUM"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_InvalidUSB/control b/server/site_tests/firmware_InvalidUSB/control
index 6bd6100..f88aa99 100644
--- a/server/site_tests/firmware_InvalidUSB/control
+++ b/server/site_tests/firmware_InvalidUSB/control
@@ -8,7 +8,6 @@
NAME = "firmware_InvalidUSB"
PURPOSE = "Servo based booting an invalid USB image test"
CRITERIA = "This test will fail if the invalid USB boots successfully"
-SUITE = "faft,faft_bios,faft_normal,faft_lv4"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_LegacyRecovery/control b/server/site_tests/firmware_LegacyRecovery/control
index 3cf80d1..cfb8b51 100644
--- a/server/site_tests/firmware_LegacyRecovery/control
+++ b/server/site_tests/firmware_LegacyRecovery/control
@@ -8,7 +8,6 @@
NAME = "firmware_LegacyRecovery"
PURPOSE = "Servo based test to Verify recovery request at Remove Screen."
CRITERIA = "This test will fail if the recovery at Remove screen is success."
-SUITE = "faft,faft_bios,faft_normal,faft_lv4"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_RONormalBoot/control b/server/site_tests/firmware_RONormalBoot/control
index f0e551b..e8d77e5 100644
--- a/server/site_tests/firmware_RONormalBoot/control
+++ b/server/site_tests/firmware_RONormalBoot/control
@@ -8,7 +8,6 @@
NAME = "firmware_RONormalBoot"
PURPOSE = "Servo based firmware RO normal boot test"
CRITERIA = "This test will fail if disabling RO normal boot flag boots failed"
-SUITE = "faft,faft_bios,faft_normal,faft_lv3"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_RONormalBoot/control.dev b/server/site_tests/firmware_RONormalBoot/control.dev
index c660c52..db8cc19 100644
--- a/server/site_tests/firmware_RONormalBoot/control.dev
+++ b/server/site_tests/firmware_RONormalBoot/control.dev
@@ -8,7 +8,6 @@
NAME = "firmware_RONormalBoot"
PURPOSE = "Servo based firmware RO normal boot test"
CRITERIA = "This test will fail if disabling RO normal boot flag boots failed"
-SUITE = "faft,faft_bios,faft_dev,faft_lv3"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_RONormalBoot/control.ec_wp b/server/site_tests/firmware_RONormalBoot/control.ec_wp
index fe7e95e..959ce23 100644
--- a/server/site_tests/firmware_RONormalBoot/control.ec_wp
+++ b/server/site_tests/firmware_RONormalBoot/control.ec_wp
@@ -8,7 +8,6 @@
NAME = "firmware_RONormalBoot"
PURPOSE = "Servo based firmware RO normal boot test"
CRITERIA = "This test will fail if disabling RO normal boot flag boots failed"
-SUITE = "faft,faft_bios,faft_normal,faft_lv3,faft_ec_wp"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_RecoveryButton/control b/server/site_tests/firmware_RecoveryButton/control
index dba9e32..6c3308d 100644
--- a/server/site_tests/firmware_RecoveryButton/control
+++ b/server/site_tests/firmware_RecoveryButton/control
@@ -8,7 +8,6 @@
NAME = "firmware_RecoveryButton"
PURPOSE = "Press recovery button and check for recovery boot"
CRITERIA = "This test will fail if firmware does not enter recovery mode"
-SUITE = "faft,faft_bios,faft_normal,faft_lv2"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_RecoveryButton/control.dev b/server/site_tests/firmware_RecoveryButton/control.dev
index aa2c3d1..3dfa85d 100644
--- a/server/site_tests/firmware_RecoveryButton/control.dev
+++ b/server/site_tests/firmware_RecoveryButton/control.dev
@@ -8,7 +8,6 @@
NAME = "firmware_RecoveryButton"
PURPOSE = "Press recovery button and check for recovery boot"
CRITERIA = "This test will fail if firmware does not enter recovery mode"
-SUITE = "faft,faft_bios,faft_dev,faft_lv2"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_RecoveryButton/control.ec_wp b/server/site_tests/firmware_RecoveryButton/control.ec_wp
index abf1f92..1d139df 100644
--- a/server/site_tests/firmware_RecoveryButton/control.ec_wp
+++ b/server/site_tests/firmware_RecoveryButton/control.ec_wp
@@ -8,7 +8,6 @@
NAME = "firmware_RecoveryButton"
PURPOSE = "Press recovery button and check for recovery boot"
CRITERIA = "This test will fail if firmware does not enter recovery mode"
-SUITE = "faft,faft_bios,faft_normal,faft_ec_wp,faft_lv2"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_RollbackFirmware/control b/server/site_tests/firmware_RollbackFirmware/control
index cfcec81..4708b18 100644
--- a/server/site_tests/firmware_RollbackFirmware/control
+++ b/server/site_tests/firmware_RollbackFirmware/control
@@ -8,7 +8,6 @@
NAME = "firmware_RollbackFirmware"
PURPOSE = "Servo based firmware rollback test."
CRITERIA = "This test will fail if firmware rollback doesn't fail verification."
-SUITE = "faft,faft_bios,faft_normal,faft_lv3"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_RollbackFirmware/control.dev b/server/site_tests/firmware_RollbackFirmware/control.dev
index f4b137c..07efdfd 100644
--- a/server/site_tests/firmware_RollbackFirmware/control.dev
+++ b/server/site_tests/firmware_RollbackFirmware/control.dev
@@ -8,7 +8,6 @@
NAME = "firmware_RollbackFirmware"
PURPOSE = "Servo based firmware rollback test."
CRITERIA = "This test will fail if firmware rollback doesn't fail verification."
-SUITE = "faft,faft_bios,faft_dev,faft_lv3"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_RollbackKernel/control b/server/site_tests/firmware_RollbackKernel/control
index f01b2c6..27ce103 100644
--- a/server/site_tests/firmware_RollbackKernel/control
+++ b/server/site_tests/firmware_RollbackKernel/control
@@ -8,7 +8,6 @@
NAME = "firmware_RollbackKernel"
PURPOSE = "Servo based kernel rollback test."
CRITERIA = "This test will fail if kernel rollback doesn't fail verification."
-SUITE = "faft,faft_bios,faft_normal,faft_lv3"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_RollbackKernel/control.dev b/server/site_tests/firmware_RollbackKernel/control.dev
index 6ba315c..1986ae4 100644
--- a/server/site_tests/firmware_RollbackKernel/control.dev
+++ b/server/site_tests/firmware_RollbackKernel/control.dev
@@ -8,7 +8,6 @@
NAME = "firmware_RollbackKernel"
PURPOSE = "Servo based kernel rollback test."
CRITERIA = "This test will fail if kernel rollback doesn't fail verification."
-SUITE = "faft,faft_bios,faft_dev,faft_lv3"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_SelfSignedBoot/control b/server/site_tests/firmware_SelfSignedBoot/control
index e6a567e..d145e31 100644
--- a/server/site_tests/firmware_SelfSignedBoot/control
+++ b/server/site_tests/firmware_SelfSignedBoot/control
@@ -18,7 +18,6 @@
2. Enabling rec mode, if it doesnt boot to USB image.
3. Ctrl-U doesnt boot to USB image after it resigned with SSD keys.
"""
-SUITE = "faft,faft_bios,faft_dev,faft_lv2"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_TryFwB/control b/server/site_tests/firmware_TryFwB/control
index 21af027..c5926ec 100644
--- a/server/site_tests/firmware_TryFwB/control
+++ b/server/site_tests/firmware_TryFwB/control
@@ -8,7 +8,6 @@
NAME = "firmware_TryFwB"
PURPOSE = "Servo based RW firmware B boot test"
CRITERIA = "This test will fail if firmware does not switch to firmware B"
-SUITE = "faft,faft_bios,faft_normal,faft_lv1"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_TryFwB/control.dev b/server/site_tests/firmware_TryFwB/control.dev
index 0d0200e..a928d38 100644
--- a/server/site_tests/firmware_TryFwB/control.dev
+++ b/server/site_tests/firmware_TryFwB/control.dev
@@ -8,7 +8,6 @@
NAME = "firmware_TryFwB"
PURPOSE = "Servo based RW firmware B boot test"
CRITERIA = "This test will fail if firmware does not switch to firmware B"
-SUITE = "faft,faft_bios,faft_dev,faft_lv1"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_TryFwB/control.ec_wp b/server/site_tests/firmware_TryFwB/control.ec_wp
index 1f7bd2d..acc26e9 100644
--- a/server/site_tests/firmware_TryFwB/control.ec_wp
+++ b/server/site_tests/firmware_TryFwB/control.ec_wp
@@ -8,7 +8,6 @@
NAME = "firmware_TryFwB"
PURPOSE = "Servo based RW firmware B boot test"
CRITERIA = "This test will fail if firmware does not switch to firmware B"
-SUITE = "faft,faft_bios,faft_normal,faft_ec_wp,faft_lv1"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_UpdateKernelDataKeyVersion/control b/server/site_tests/firmware_UpdateKernelDataKeyVersion/control
index 5ff8436..15bd797 100644
--- a/server/site_tests/firmware_UpdateKernelDataKeyVersion/control
+++ b/server/site_tests/firmware_UpdateKernelDataKeyVersion/control
@@ -17,7 +17,6 @@
4. After recovery, device can't successfully restart.
5. Kernel datakey version does not recover to original version after recovery.
"""
-SUITE = "faft,faft_update,faft_dev"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_UpdateKernelVersion/control b/server/site_tests/firmware_UpdateKernelVersion/control
index 1158eb6..a6dd075 100644
--- a/server/site_tests/firmware_UpdateKernelVersion/control
+++ b/server/site_tests/firmware_UpdateKernelVersion/control
@@ -15,7 +15,6 @@
4. After recovery, device can't successfully restart.
5. Kernel version does not recover to original version after recovery.
"""
-SUITE = "faft,faft_update,faft_dev"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_UserRequestRecovery/control b/server/site_tests/firmware_UserRequestRecovery/control
index 46e9765..f99e5d5 100644
--- a/server/site_tests/firmware_UserRequestRecovery/control
+++ b/server/site_tests/firmware_UserRequestRecovery/control
@@ -8,7 +8,6 @@
NAME = "firmware_UserRequestRecovery"
PURPOSE = "Request recovery mode and check it next reboot."
CRITERIA = "This test will fail if firmware does not enter recovery mode"
-SUITE = "faft,faft_bios,faft_normal,faft_lv2"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_UserRequestRecovery/control.dev b/server/site_tests/firmware_UserRequestRecovery/control.dev
index 49aca5a..be7e0a2 100644
--- a/server/site_tests/firmware_UserRequestRecovery/control.dev
+++ b/server/site_tests/firmware_UserRequestRecovery/control.dev
@@ -8,7 +8,6 @@
NAME = "firmware_UserRequestRecovery"
PURPOSE = "Request recovery mode and check it next reboot."
CRITERIA = "This test will fail if firmware does not enter recovery mode"
-SUITE = "faft,faft_bios,faft_dev,faft_lv2"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_UserRequestRecovery/control.ec_wp b/server/site_tests/firmware_UserRequestRecovery/control.ec_wp
index f3347bd..4f6682e 100644
--- a/server/site_tests/firmware_UserRequestRecovery/control.ec_wp
+++ b/server/site_tests/firmware_UserRequestRecovery/control.ec_wp
@@ -8,7 +8,6 @@
NAME = "firmware_UserRequestRecovery"
PURPOSE = "Request recovery mode and check it next reboot."
CRITERIA = "This test will fail if firmware does not enter recovery mode"
-SUITE = "faft,faft_bios,faft_normal,faft_ec_wp,faft_lv2"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/network_ONCServer/control b/server/site_tests/network_ONCServer/control
index f7b6578..e6ba308 100644
--- a/server/site_tests/network_ONCServer/control
+++ b/server/site_tests/network_ONCServer/control
@@ -8,7 +8,6 @@
TEST_CATEGORY = "Stress"
TEST_CLASS = "network"
TEST_TYPE = "Server"
-SUITE = "onccell"
SYNC_COUNT = 1
DOC = """
ONCServer is a suite of 3-machine tests and a client side test network_ONC to
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkSGI b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkSGI
index 384d6f4..c08b827 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkSGI
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkSGI
@@ -6,7 +6,6 @@
NAME = 'network_WiFi_SimpleConnect.wifi_checkSGI'
TIME = 'SHORT'
TEST_TYPE = 'Server'
-SUITE = 'wifi_flaky'
DEPENDENCIES = 'wificell'
DOC = """
diff --git a/server/site_tests/suites/control.desktopui_browsertest b/server/site_tests/suites/control.desktopui_browsertest
index 8e88f48..10abbf2 100644
--- a/server/site_tests/suites/control.desktopui_browsertest
+++ b/server/site_tests/suites/control.desktopui_browsertest
@@ -4,7 +4,6 @@
AUTHOR = "Chrome OS Team"
NAME = "BrowserTests"
-SUITE = "browsertests"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "suite"
diff --git a/server/site_tests/suites/control.desktopui_pyauto_basic b/server/site_tests/suites/control.desktopui_pyauto_basic
index 61b1526..604f656 100644
--- a/server/site_tests/suites/control.desktopui_pyauto_basic
+++ b/server/site_tests/suites/control.desktopui_pyauto_basic
@@ -4,7 +4,6 @@
AUTHOR = "Chrome OS Team"
NAME = "PyAuto Basic"
-SUITE = "pyauto_basic"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "suite"
diff --git a/server/site_tests/suites/control.desktopui_pyautofunctionaltests b/server/site_tests/suites/control.desktopui_pyautofunctionaltests
index 735bc6a..62c163c 100644
--- a/server/site_tests/suites/control.desktopui_pyautofunctionaltests
+++ b/server/site_tests/suites/control.desktopui_pyautofunctionaltests
@@ -4,7 +4,6 @@
AUTHOR = "Chrome OS Team"
NAME = "PyAuto"
-SUITE = "pyauto"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "suite"
diff --git a/server/site_tests/suites/control.desktopui_syncintegrationtests b/server/site_tests/suites/control.desktopui_syncintegrationtests
index 31b7ef5..b8f7a18 100644
--- a/server/site_tests/suites/control.desktopui_syncintegrationtests
+++ b/server/site_tests/suites/control.desktopui_syncintegrationtests
@@ -4,7 +4,6 @@
AUTHOR = "Chrome OS Team"
NAME = "Sync"
-SUITE = "sync"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "suite"
diff --git a/server/site_tests/telemetry_Benchmarks/control.Memory b/server/site_tests/telemetry_Benchmarks/control.Memory
index c405176..7334e71 100644
--- a/server/site_tests/telemetry_Benchmarks/control.Memory
+++ b/server/site_tests/telemetry_Benchmarks/control.Memory
@@ -4,7 +4,6 @@
AUTHOR = "chromeos-perf"
NAME = "Telemetry Memory Benchmark"
-SUITE = "perf_v2"
TIME = "LONG"
TEST_CATEGORY = "Benchmark"
TEST_CLASS = "performance"
diff --git a/suite_scheduler.ini b/suite_scheduler.ini
index f53eef5..635b7bd 100644
--- a/suite_scheduler.ini
+++ b/suite_scheduler.ini
@@ -135,12 +135,6 @@
branch_specs: >=R30
pool: suites
-[OncCellSuite]
-run_on: nightly
-suite: onccell
-pool: onccell
-branch_specs: >=R26
-
[PowerDaily]
run_on: nightly
suite: power_daily
@@ -167,30 +161,6 @@
branch_specs: >=R21
pool: power
-[pyauto]
-run_on: new_build
-suite: pyauto
-branch_specs: >=R21
-pool: suites
-
-[pyauto_perf]
-run_on: new_build
-suite: pyauto_perf
-branch_specs: >=R21
-pool: suites
-
-[pyauto_perf_snow]
-run_on: new_build
-suite: pyauto_perf
-branch_specs: >=R22
-pool: snow
-
-[pyauto_basic]
-run_on: new_build
-suite: pyauto_basic
-branch_specs: >=R21
-pool: suites
-
[pagecycler]
run_on: new_build
suite: pagecycler
@@ -228,18 +198,6 @@
branch_specs: >=R26
pool: suites
-[sync]
-run_on: new_build
-suite: sync
-branch_specs: >=R21
-pool: suites
-
-[browsertests]
-run_on: new_build
-suite: browsertests
-branch_specs: >=R21
-pool: suites
-
# run only and post-ALEX platforms (so do not run mario, zgb, and alex)
[VDA]
run_on: new_build
@@ -254,31 +212,12 @@
branch_specs: >=R23
pool: link_perf
-[FirmwarePerBuildRegression_normal]
-run_on: new_build
-suite: faft_normal
-pool: faft-normal
-branch_specs: >=R26
-
-[FirmwarePerBuildRegression_dev]
-run_on: new_build
-suite: faft_dev
-pool: faft-dev
-branch_specs: >=R26
-
[FirmwarePerBuildRegression_ec]
run_on: new_build
suite: faft_ec
pool: faft-ec
branch_specs: >=R26
-#[Network_wifi]
-# We need to figure out how we can work out the scheduling of this test.
-#run_on: nightly
-#suite: network_wifi
-#branch_specs: >=R21
-#pool: ????
-
[perf_v2]
run_on: new_build
suite: perf_v2
@@ -297,12 +236,6 @@
branch_specs: >=R29
pool: wificell
-[WiFi_FlakyTests]
-run_on: nightly
-suite: wifi_flaky
-branch_specs: >=R30
-pool: wificell
-
[SecurityWeekly]
run_on: weekly
suite: security_weekly