faft: Refine the SUITE tags of FAFTs
This CL creates faft_bios for all BIOS FAFTs. faft_bios tests are categorized
into 2 groups: faft_normal and faft_dev.
When running all BIOS FAFTs, we suggest to run it using 2 suites, like:
$ run_remote_teshs.sh ... suite:faft_normal suite:faft_dev
instead of:
$ run_remote_teshs.sh ... suite:faft_bios
As run_remote_test.sh picks tests in a random basic, using 2 suites helps
all tests under the same mode grouped together. It save time to switching
between normal mode and dev mode.
It also makes all stress tests only tagged in faft_stress.
BUG=chromium-os:32859
TEST=None, trivial, only tags changed.
Change-Id: Idfa29f3c1a321647a2f462167a142d191967f73e
Reviewed-on: https://gerrit.chromium.org/gerrit/37112
Reviewed-by: Vic Yang <victoryang@chromium.org>
Commit-Ready: Tom Wai-Hong Tam <waihong@chromium.org>
Tested-by: Tom Wai-Hong Tam <waihong@chromium.org>
diff --git a/server/site_tests/firmware_CgptState/control b/server/site_tests/firmware_CgptState/control
index af5cde8..65ae527 100644
--- a/server/site_tests/firmware_CgptState/control
+++ b/server/site_tests/firmware_CgptState/control
@@ -8,7 +8,7 @@
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_normal,faft_lv4"
+SUITE = "faft,faft_bios,faft_normal,faft_lv4"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_CgptStress/control b/server/site_tests/firmware_CgptStress/control
index 6808f4b..24ea2e6 100644
--- a/server/site_tests/firmware_CgptStress/control
+++ b/server/site_tests/firmware_CgptStress/control
@@ -8,7 +8,7 @@
NAME = "firmware_CgptStress"
PURPOSE = "Servo based cgpt stress test"
CRITERIA = "This test will fail if changing cgpt fails to switch kernel"
-SUITE = "faft,faft_normal,faft_stress"
+SUITE = "faft,faft_stress"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_CgptStress/control.dev b/server/site_tests/firmware_CgptStress/control.dev
index e269970..1487c95 100644
--- a/server/site_tests/firmware_CgptStress/control.dev
+++ b/server/site_tests/firmware_CgptStress/control.dev
@@ -8,7 +8,7 @@
NAME = "firmware_CgptStress"
PURPOSE = "Servo based cgpt stress test"
CRITERIA = "This test will fail if changing cgpt fails to switch kernel"
-SUITE = "faft,faft_dev,faft_stress"
+SUITE = "faft,faft_stress"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_ConsecutiveBoot/control b/server/site_tests/firmware_ConsecutiveBoot/control
index 50c90f2..b9bdd06 100644
--- a/server/site_tests/firmware_ConsecutiveBoot/control
+++ b/server/site_tests/firmware_ConsecutiveBoot/control
@@ -8,7 +8,7 @@
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_normal,faft_stress"
+SUITE = "faft,faft_stress"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_ConsecutiveBoot/control.dev b/server/site_tests/firmware_ConsecutiveBoot/control.dev
index 2087794..8888204 100644
--- a/server/site_tests/firmware_ConsecutiveBoot/control.dev
+++ b/server/site_tests/firmware_ConsecutiveBoot/control.dev
@@ -8,7 +8,7 @@
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_dev,faft_stress"
+SUITE = "faft,faft_stress"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_CorruptBothFwBodyAB/control b/server/site_tests/firmware_CorruptBothFwBodyAB/control
index fbc0448..ed8bcad 100644
--- a/server/site_tests/firmware_CorruptBothFwBodyAB/control
+++ b/server/site_tests/firmware_CorruptBothFwBodyAB/control
@@ -8,7 +8,7 @@
NAME = "firmware_CorruptFwBodyAB"
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_normal,faft_lv3"
+SUITE = "faft,faft_bios,faft_normal,faft_lv3"
TIME = "LONG"
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 c3444d2..5aa8ce5 100644
--- a/server/site_tests/firmware_CorruptBothFwBodyAB/control.dev
+++ b/server/site_tests/firmware_CorruptBothFwBodyAB/control.dev
@@ -8,7 +8,7 @@
NAME = "firmware_CorruptFwBodyAB"
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_dev,faft_lv3"
+SUITE = "faft,faft_bios,faft_dev,faft_lv3"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_CorruptBothFwSigAB/control b/server/site_tests/firmware_CorruptBothFwSigAB/control
index 2749539..ecec673 100644
--- a/server/site_tests/firmware_CorruptBothFwSigAB/control
+++ b/server/site_tests/firmware_CorruptBothFwSigAB/control
@@ -8,7 +8,7 @@
NAME = "firmware_CorruptFwSigAB"
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_normal,faft_lv3"
+SUITE = "faft,faft_bios,faft_normal,faft_lv3"
TIME = "LONG"
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 c4eb970..a4df532 100644
--- a/server/site_tests/firmware_CorruptBothFwSigAB/control.dev
+++ b/server/site_tests/firmware_CorruptBothFwSigAB/control.dev
@@ -8,7 +8,7 @@
NAME = "firmware_CorruptFwSigAB"
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_dev,faft_lv3"
+SUITE = "faft,faft_bios,faft_dev,faft_lv3"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_CorruptBothKernelAB/control b/server/site_tests/firmware_CorruptBothKernelAB/control
index d4bfe70..040d2bf 100644
--- a/server/site_tests/firmware_CorruptBothKernelAB/control
+++ b/server/site_tests/firmware_CorruptBothKernelAB/control
@@ -8,7 +8,7 @@
NAME = "firmware_CorruptKernelAB"
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_normal,faft_lv3"
+SUITE = "faft,faft_bios,faft_normal,faft_lv3"
TIME = "LONG"
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 6140867..f1381a2 100644
--- a/server/site_tests/firmware_CorruptBothKernelAB/control.dev
+++ b/server/site_tests/firmware_CorruptBothKernelAB/control.dev
@@ -8,7 +8,7 @@
NAME = "firmware_CorruptKernelAB"
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_dev,faft_lv3"
+SUITE = "faft,faft_bios,faft_dev,faft_lv3"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_CorruptFwBodyA/control b/server/site_tests/firmware_CorruptFwBodyA/control
index b98cc2e..82b27cb 100644
--- a/server/site_tests/firmware_CorruptFwBodyA/control
+++ b/server/site_tests/firmware_CorruptFwBodyA/control
@@ -8,7 +8,7 @@
NAME = "firmware_CorruptFwBodyA"
PURPOSE = "Servo based firmware A body corruption test"
CRITERIA = "This test will fail if firmware verification mis-behaved"
-SUITE = "faft,faft_normal,faft_lv3"
+SUITE = "faft,faft_bios,faft_normal,faft_lv3"
TIME = "LONG"
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 b3ae7b7..d06f92f 100644
--- a/server/site_tests/firmware_CorruptFwBodyA/control.dev
+++ b/server/site_tests/firmware_CorruptFwBodyA/control.dev
@@ -8,7 +8,7 @@
NAME = "firmware_CorruptFwBodyA"
PURPOSE = "Servo based firmware A body corruption test"
CRITERIA = "This test will fail if firmware verification mis-behaved"
-SUITE = "faft,faft_dev,faft_lv3"
+SUITE = "faft,faft_bios,faft_dev,faft_lv3"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_CorruptFwBodyB/control b/server/site_tests/firmware_CorruptFwBodyB/control
index 8b74b5a..50d368b 100644
--- a/server/site_tests/firmware_CorruptFwBodyB/control
+++ b/server/site_tests/firmware_CorruptFwBodyB/control
@@ -8,7 +8,7 @@
NAME = "firmware_CorruptFwBodyB"
PURPOSE = "Servo based firmware B body corruption test"
CRITERIA = "This test will fail if firmware verification mis-behaved"
-SUITE = "faft,faft_normal,faft_lv3"
+SUITE = "faft,faft_bios,faft_normal,faft_lv3"
TIME = "LONG"
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 a620966..b63b5f7 100644
--- a/server/site_tests/firmware_CorruptFwBodyB/control.dev
+++ b/server/site_tests/firmware_CorruptFwBodyB/control.dev
@@ -8,7 +8,7 @@
NAME = "firmware_CorruptFwBodyB"
PURPOSE = "Servo based firmware B body corruption test"
CRITERIA = "This test will fail if firmware verification mis-behaved"
-SUITE = "faft,faft_dev,faft_lv3"
+SUITE = "faft,faft_bios,faft_dev,faft_lv3"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_CorruptFwSigA/control b/server/site_tests/firmware_CorruptFwSigA/control
index 4fe7bc8..8bc8120 100644
--- a/server/site_tests/firmware_CorruptFwSigA/control
+++ b/server/site_tests/firmware_CorruptFwSigA/control
@@ -8,7 +8,7 @@
NAME = "firmware_CorruptFwSigA"
PURPOSE = "Servo based firmware A signature corruption test"
CRITERIA = "This test will fail if firmware verification mis-behaved"
-SUITE = "faft,faft_normal,faft_lv3"
+SUITE = "faft,faft_bios,faft_normal,faft_lv3"
TIME = "LONG"
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 29284e9..23be2cd 100644
--- a/server/site_tests/firmware_CorruptFwSigA/control.dev
+++ b/server/site_tests/firmware_CorruptFwSigA/control.dev
@@ -8,7 +8,7 @@
NAME = "firmware_CorruptFwSigA"
PURPOSE = "Servo based firmware A signature corruption test"
CRITERIA = "This test will fail if firmware verification mis-behaved"
-SUITE = "faft,faft_dev,faft_lv3"
+SUITE = "faft,faft_bios,faft_dev,faft_lv3"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_CorruptFwSigB/control b/server/site_tests/firmware_CorruptFwSigB/control
index ff6657d..4f178f5 100644
--- a/server/site_tests/firmware_CorruptFwSigB/control
+++ b/server/site_tests/firmware_CorruptFwSigB/control
@@ -8,7 +8,7 @@
NAME = "firmware_CorruptFwSigB"
PURPOSE = "Servo based firmware signature B corruption test"
CRITERIA = "This test will fail if firmware verification mis-behaved"
-SUITE = "faft,faft_normal,faft_lv3"
+SUITE = "faft,faft_bios,faft_normal,faft_lv3"
TIME = "LONG"
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 9e9362a..07b7713 100644
--- a/server/site_tests/firmware_CorruptFwSigB/control.dev
+++ b/server/site_tests/firmware_CorruptFwSigB/control.dev
@@ -8,7 +8,7 @@
NAME = "firmware_CorruptFwSigB"
PURPOSE = "Servo based firmware signature B corruption test"
CRITERIA = "This test will fail if firmware verification mis-behaved"
-SUITE = "faft,faft_dev,faft_lv3"
+SUITE = "faft,faft_bios,faft_dev,faft_lv3"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_CorruptKernelA/control b/server/site_tests/firmware_CorruptKernelA/control
index 104396b..fdac5ac 100644
--- a/server/site_tests/firmware_CorruptKernelA/control
+++ b/server/site_tests/firmware_CorruptKernelA/control
@@ -8,7 +8,7 @@
NAME = "firmware_CorruptKernelA"
PURPOSE = "Servo based kernel A corruption test"
CRITERIA = "This test will fail if kernel verification mis-behaved"
-SUITE = "faft,faft_normal,faft_lv3"
+SUITE = "faft,faft_bios,faft_normal,faft_lv3"
TIME = "LONG"
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 9b73f50..c5f7b48 100644
--- a/server/site_tests/firmware_CorruptKernelA/control.dev
+++ b/server/site_tests/firmware_CorruptKernelA/control.dev
@@ -8,7 +8,7 @@
NAME = "firmware_CorruptKernelA"
PURPOSE = "Servo based kernel A corruption test"
CRITERIA = "This test will fail if kernel verification mis-behaved"
-SUITE = "faft,faft_dev,faft_lv3"
+SUITE = "faft,faft_bios,faft_dev,faft_lv3"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_CorruptKernelB/control b/server/site_tests/firmware_CorruptKernelB/control
index ed80070..6998b10 100644
--- a/server/site_tests/firmware_CorruptKernelB/control
+++ b/server/site_tests/firmware_CorruptKernelB/control
@@ -8,7 +8,7 @@
NAME = "firmware_CorruptKernelB"
PURPOSE = "Servo based kernel B corruption test"
CRITERIA = "This test will fail if kernel verification mis-behaved"
-SUITE = "faft,faft_normal,faft_lv3"
+SUITE = "faft,faft_bios,faft_normal,faft_lv3"
TIME = "LONG"
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 3bc5758..cf79a8f 100644
--- a/server/site_tests/firmware_CorruptKernelB/control.dev
+++ b/server/site_tests/firmware_CorruptKernelB/control.dev
@@ -8,7 +8,7 @@
NAME = "firmware_CorruptKernelB"
PURPOSE = "Servo based kernel B corruption test"
CRITERIA = "This test will fail if kernel verification mis-behaved"
-SUITE = "faft,faft_dev,faft_lv3"
+SUITE = "faft,faft_bios,faft_dev,faft_lv3"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_DevBootUSB/control b/server/site_tests/firmware_DevBootUSB/control
index dee68da..890438d 100644
--- a/server/site_tests/firmware_DevBootUSB/control
+++ b/server/site_tests/firmware_DevBootUSB/control
@@ -8,7 +8,7 @@
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_dev,faft_lv2"
+SUITE = "faft,faft_bios,faft_dev,faft_lv2"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_DevFwNormalBoot/control b/server/site_tests/firmware_DevFwNormalBoot/control
index a7075a7..fe0c94e 100644
--- a/server/site_tests/firmware_DevFwNormalBoot/control
+++ b/server/site_tests/firmware_DevFwNormalBoot/control
@@ -8,7 +8,7 @@
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_dev,faft_lv3"
+SUITE = "faft,faft_bios,faft_dev,faft_lv3"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_DevMode/control b/server/site_tests/firmware_DevMode/control
index 0b7d94e..22dc3fd 100644
--- a/server/site_tests/firmware_DevMode/control
+++ b/server/site_tests/firmware_DevMode/control
@@ -8,7 +8,7 @@
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_normal,faft_lv1"
+SUITE = "faft,faft_bios,faft_normal,faft_lv1"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_DevModeStress/control b/server/site_tests/firmware_DevModeStress/control
index 4d5b5ac..1b3e5f3 100644
--- a/server/site_tests/firmware_DevModeStress/control
+++ b/server/site_tests/firmware_DevModeStress/control
@@ -8,7 +8,7 @@
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_dev,faft_stress"
+SUITE = "faft,faft_stress"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_DevScreenTimeout/control b/server/site_tests/firmware_DevScreenTimeout/control
index cd444b9..8fcde44 100644
--- a/server/site_tests/firmware_DevScreenTimeout/control
+++ b/server/site_tests/firmware_DevScreenTimeout/control
@@ -8,7 +8,7 @@
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_dev,faft_lv4"
+SUITE = "faft,faft_bios,faft_dev,faft_lv4"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_DevTriggerRecovery/control b/server/site_tests/firmware_DevTriggerRecovery/control
index c0030da..c723c8a 100644
--- a/server/site_tests/firmware_DevTriggerRecovery/control
+++ b/server/site_tests/firmware_DevTriggerRecovery/control
@@ -8,7 +8,7 @@
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_normal,faft_lv2"
+SUITE = "faft,faft_bios,faft_normal,faft_lv2"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_FAFTSetup/control b/server/site_tests/firmware_FAFTSetup/control
index e066926..d9b0669 100644
--- a/server/site_tests/firmware_FAFTSetup/control
+++ b/server/site_tests/firmware_FAFTSetup/control
@@ -8,7 +8,7 @@
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_normal,faft_lv2"
+SUITE = "faft,faft_bios,faft_normal,faft_lv2"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_FwScreenCloseLid/control b/server/site_tests/firmware_FwScreenCloseLid/control
index b68ffe2..f209bfa 100644
--- a/server/site_tests/firmware_FwScreenCloseLid/control
+++ b/server/site_tests/firmware_FwScreenCloseLid/control
@@ -8,7 +8,7 @@
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_dev,faft_lv4"
+SUITE = "faft,faft_bios,faft_dev,faft_lv4"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_FwScreenPressPower/control b/server/site_tests/firmware_FwScreenPressPower/control
index f86f552..8e3f00b 100644
--- a/server/site_tests/firmware_FwScreenPressPower/control
+++ b/server/site_tests/firmware_FwScreenPressPower/control
@@ -8,7 +8,7 @@
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_dev,faft_lv4"
+SUITE = "faft,faft_bios,faft_dev,faft_lv4"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_InvalidUSB/control b/server/site_tests/firmware_InvalidUSB/control
index 92f9af9..3170210 100644
--- a/server/site_tests/firmware_InvalidUSB/control
+++ b/server/site_tests/firmware_InvalidUSB/control
@@ -8,7 +8,7 @@
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_normal,faft_lv4"
+SUITE = "faft,faft_bios,faft_normal,faft_lv4"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_RONormalBoot/control b/server/site_tests/firmware_RONormalBoot/control
index 25e4e66..db7e886 100644
--- a/server/site_tests/firmware_RONormalBoot/control
+++ b/server/site_tests/firmware_RONormalBoot/control
@@ -8,7 +8,7 @@
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_normal,faft_lv3"
+SUITE = "faft,faft_bios,faft_normal,faft_lv3"
TIME = "LONG"
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 1a361a8..9bea459 100644
--- a/server/site_tests/firmware_RONormalBoot/control.dev
+++ b/server/site_tests/firmware_RONormalBoot/control.dev
@@ -8,7 +8,7 @@
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_dev,faft_lv3"
+SUITE = "faft,faft_bios,faft_dev,faft_lv3"
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 2ac5e9d..b12e9c3 100644
--- a/server/site_tests/firmware_RecoveryButton/control
+++ b/server/site_tests/firmware_RecoveryButton/control
@@ -8,7 +8,7 @@
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_normal,faft_lv2"
+SUITE = "faft,faft_bios,faft_normal,faft_lv2"
TIME = "LONG"
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 3a38880..450a1ef 100644
--- a/server/site_tests/firmware_RecoveryButton/control.dev
+++ b/server/site_tests/firmware_RecoveryButton/control.dev
@@ -8,7 +8,7 @@
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_dev,faft_lv2"
+SUITE = "faft,faft_bios,faft_dev,faft_lv2"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_RollbackFirmware/control b/server/site_tests/firmware_RollbackFirmware/control
index e551d33..15f0eca 100644
--- a/server/site_tests/firmware_RollbackFirmware/control
+++ b/server/site_tests/firmware_RollbackFirmware/control
@@ -8,7 +8,7 @@
NAME = "firmware_RollbackFirmware"
PURPOSE = "Servo based firmware rollback test."
CRITERIA = "This test will fail if firmware rollback doesn't fail verification."
-SUITE = "faft,faft_normal,faft_lv3"
+SUITE = "faft,faft_bios,faft_normal,faft_lv3"
TIME = "LONG"
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 551d9da..cc7b022 100644
--- a/server/site_tests/firmware_RollbackFirmware/control.dev
+++ b/server/site_tests/firmware_RollbackFirmware/control.dev
@@ -8,7 +8,7 @@
NAME = "firmware_RollbackFirmware"
PURPOSE = "Servo based firmware rollback test."
CRITERIA = "This test will fail if firmware rollback doesn't fail verification."
-SUITE = "faft,faft_dev,faft_lv3"
+SUITE = "faft,faft_bios,faft_dev,faft_lv3"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_RollbackKernel/control b/server/site_tests/firmware_RollbackKernel/control
index 8d80748..9260326 100644
--- a/server/site_tests/firmware_RollbackKernel/control
+++ b/server/site_tests/firmware_RollbackKernel/control
@@ -8,7 +8,7 @@
NAME = "firmware_RollbackKernel"
PURPOSE = "Servo based kernel rollback test."
CRITERIA = "This test will fail if kernel rollback doesn't fail verification."
-SUITE = "faft,faft_normal,faft_lv3"
+SUITE = "faft,faft_bios,faft_normal,faft_lv3"
TIME = "LONG"
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 d37f618..d55fe29 100644
--- a/server/site_tests/firmware_RollbackKernel/control.dev
+++ b/server/site_tests/firmware_RollbackKernel/control.dev
@@ -8,7 +8,7 @@
NAME = "firmware_RollbackKernel"
PURPOSE = "Servo based kernel rollback test."
CRITERIA = "This test will fail if kernel rollback doesn't fail verification."
-SUITE = "faft,faft_dev,faft_lv3"
+SUITE = "faft,faft_bios,faft_dev,faft_lv3"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_TryFwB/control b/server/site_tests/firmware_TryFwB/control
index 9e2c59b..18c1404 100644
--- a/server/site_tests/firmware_TryFwB/control
+++ b/server/site_tests/firmware_TryFwB/control
@@ -8,7 +8,7 @@
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_normal,faft_lv1"
+SUITE = "faft,faft_bios,faft_normal,faft_lv1"
TIME = "LONG"
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 0510826..934b802 100644
--- a/server/site_tests/firmware_TryFwB/control.dev
+++ b/server/site_tests/firmware_TryFwB/control.dev
@@ -8,7 +8,7 @@
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_dev,faft_lv1"
+SUITE = "faft,faft_bios,faft_dev,faft_lv1"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_UserRequestRecovery/control b/server/site_tests/firmware_UserRequestRecovery/control
index f88326a..a9d05ae 100644
--- a/server/site_tests/firmware_UserRequestRecovery/control
+++ b/server/site_tests/firmware_UserRequestRecovery/control
@@ -8,7 +8,7 @@
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_normal,faft_lv2"
+SUITE = "faft,faft_bios,faft_normal,faft_lv2"
TIME = "LONG"
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 18fa0bd..c1c9fc7 100644
--- a/server/site_tests/firmware_UserRequestRecovery/control.dev
+++ b/server/site_tests/firmware_UserRequestRecovery/control.dev
@@ -8,7 +8,7 @@
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_dev,faft_lv2"
+SUITE = "faft,faft_bios,faft_dev,faft_lv2"
TIME = "LONG"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"