FAFT: Categorize FAFT tests into faft_normal, faft_dev, and faft_ec
To speed-up running FAFT, we should run faft_normal, faft_dev, and faft_ec
tests separately, saving time to switch mode. So all non-EC FAFT should be
categorized into these 3 groups. This CL add the tests which miss this field.
BUG=chromium-os:38141
TEST=None, trivial change
Change-Id: I9fa0335dbc53a874d1f08a16b92b20447d41d777
Reviewed-on: https://gerrit.chromium.org/gerrit/41915
Commit-Queue: Tom Wai-Hong Tam <waihong@chromium.org>
Reviewed-by: Tom Wai-Hong Tam <waihong@chromium.org>
Tested-by: Tom Wai-Hong Tam <waihong@chromium.org>
diff --git a/server/site_tests/firmware_CgptStress/control b/server/site_tests/firmware_CgptStress/control
index bb21dc1..be736ef 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_stress"
+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 d01657b..da08ffb 100644
--- a/server/site_tests/firmware_CgptStress/control.dev
+++ b/server/site_tests/firmware_CgptStress/control.dev
@@ -8,9 +8,9 @@
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"
+SUITE = "faft,faft_stress,faft_dev"
TIME = "SHORT"
-TEST_CATEGORY = "Functional"
+TEST_CATEGORY = "Stress"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_ConsecutiveBoot/control b/server/site_tests/firmware_ConsecutiveBoot/control
index 714e285..9d7d6be 100644
--- a/server/site_tests/firmware_ConsecutiveBoot/control
+++ b/server/site_tests/firmware_ConsecutiveBoot/control
@@ -8,9 +8,9 @@
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"
+SUITE = "faft,faft_stress,faft_normal"
TIME = "SHORT"
-TEST_CATEGORY = "Functional"
+TEST_CATEGORY = "Stress"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_ConsecutiveBoot/control.dev b/server/site_tests/firmware_ConsecutiveBoot/control.dev
index 1cf5215..0f241d9 100644
--- a/server/site_tests/firmware_ConsecutiveBoot/control.dev
+++ b/server/site_tests/firmware_ConsecutiveBoot/control.dev
@@ -8,9 +8,9 @@
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"
+SUITE = "faft,faft_stress,faft_dev"
TIME = "SHORT"
-TEST_CATEGORY = "Functional"
+TEST_CATEGORY = "Stress"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_DevMode/control.ec_wp b/server/site_tests/firmware_DevMode/control.ec_wp
index 3ad0540..7b12bcd 100644
--- a/server/site_tests/firmware_DevMode/control.ec_wp
+++ b/server/site_tests/firmware_DevMode/control.ec_wp
@@ -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_bios,faft_ec_wp,faft_lv1"
+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 1b50e73..2557a56 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_stress"
+SUITE = "faft,faft_stress,faft_dev"
TIME = "SHORT"
TEST_CATEGORY = "Stress"
TEST_CLASS = "firmware"
diff --git a/server/site_tests/firmware_ECWriteProtect/control.dev b/server/site_tests/firmware_ECWriteProtect/control.dev
index 93984d4..f2888d9 100644
--- a/server/site_tests/firmware_ECWriteProtect/control.dev
+++ b/server/site_tests/firmware_ECWriteProtect/control.dev
@@ -8,6 +8,7 @@
NAME = "firmware_ECWriteProtect"
PURPOSE = "Servo based EC write protect test"
CRITERIA = "This test will fail if EC write protect misbehaved"
+SUITE = "faft,faft_ec"
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 d19292a..152c329 100644
--- a/server/site_tests/firmware_RecoveryButton/control.ec_wp
+++ b/server/site_tests/firmware_RecoveryButton/control.ec_wp
@@ -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_bios,faft_ec_wp,faft_lv2"
+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_SoftwareSync/control.dev b/server/site_tests/firmware_SoftwareSync/control.dev
index c236ee1..ee48e8a 100644
--- a/server/site_tests/firmware_SoftwareSync/control.dev
+++ b/server/site_tests/firmware_SoftwareSync/control.dev
@@ -8,6 +8,7 @@
NAME = "firmware_SoftwareSync"
PURPOSE = "Servo based EC software sync test"
CRITERIA = "This test will fail if EC software sync misbehalved"
+SUITE = "faft,faft_ec"
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 4947cbf..0b1bc21 100644
--- a/server/site_tests/firmware_TryFwB/control.ec_wp
+++ b/server/site_tests/firmware_TryFwB/control.ec_wp
@@ -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_bios,faft_ec_wp,faft_lv1"
+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 13b859e..ccd6c9c 100644
--- a/server/site_tests/firmware_UpdateKernelDataKeyVersion/control
+++ b/server/site_tests/firmware_UpdateKernelDataKeyVersion/control
@@ -17,7 +17,7 @@
4. After recovery, device can't successfully restart.
5. Kernel datakey version does not recover to original version after recovery.
"""
-SUITE = "faft,faft_update"
+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 d6ddc47..b6deb2b 100644
--- a/server/site_tests/firmware_UpdateKernelVersion/control
+++ b/server/site_tests/firmware_UpdateKernelVersion/control
@@ -15,7 +15,7 @@
4. After recovery, device can't successfully restart.
5. Kernel version does not recover to original version after recovery.
"""
-SUITE = "faft,faft_update"
+SUITE = "faft,faft_update,faft_dev"
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 4092854..43cf96b 100644
--- a/server/site_tests/firmware_UserRequestRecovery/control.ec_wp
+++ b/server/site_tests/firmware_UserRequestRecovery/control.ec_wp
@@ -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_bios,faft_ec_wp,faft_lv2"
+SUITE = "faft,faft_bios,faft_normal,faft_ec_wp,faft_lv2"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"