FAFT: Change the TIME and TEST_CATEGORY fields of FAFT control files
The TIME field is how long the test runs. The definition:
SHORT < 15m, MEDIUM < 4 hours, LONG > 4 hour
This CL is to change them to fit this rule. And make the stress tests to
the proper category.
BUG=None
TEST=None, trivial change
Change-Id: I60bf03fb295a1907b55083a60fda1f0f76dfbc86
Reviewed-on: https://gerrit.chromium.org/gerrit/41793
Reviewed-by: Vic Yang <victoryang@chromium.org>
Commit-Queue: 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 65ae527..c71cb3f 100644
--- a/server/site_tests/firmware_CgptState/control
+++ b/server/site_tests/firmware_CgptState/control
@@ -9,7 +9,7 @@
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 = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_CgptStress/control b/server/site_tests/firmware_CgptStress/control
index 24ea2e6..bb21dc1 100644
--- a/server/site_tests/firmware_CgptStress/control
+++ b/server/site_tests/firmware_CgptStress/control
@@ -9,8 +9,8 @@
PURPOSE = "Servo based cgpt stress test"
CRITERIA = "This test will fail if changing cgpt fails to switch kernel"
SUITE = "faft,faft_stress"
-TIME = "LONG"
-TEST_CATEGORY = "Functional"
+TIME = "SHORT"
+TEST_CATEGORY = "Stress"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_CgptStress/control.dev b/server/site_tests/firmware_CgptStress/control.dev
index 1487c95..d01657b 100644
--- a/server/site_tests/firmware_CgptStress/control.dev
+++ b/server/site_tests/firmware_CgptStress/control.dev
@@ -9,7 +9,7 @@
PURPOSE = "Servo based cgpt stress test"
CRITERIA = "This test will fail if changing cgpt fails to switch kernel"
SUITE = "faft,faft_stress"
-TIME = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_ConsecutiveBoot/control b/server/site_tests/firmware_ConsecutiveBoot/control
index b9bdd06..714e285 100644
--- a/server/site_tests/firmware_ConsecutiveBoot/control
+++ b/server/site_tests/firmware_ConsecutiveBoot/control
@@ -9,7 +9,7 @@
PURPOSE = "Servo based consecutive boot test"
CRITERIA = "This test will fail if DUT fails to boot from power-off"
SUITE = "faft,faft_stress"
-TIME = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
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 8888204..1cf5215 100644
--- a/server/site_tests/firmware_ConsecutiveBoot/control.dev
+++ b/server/site_tests/firmware_ConsecutiveBoot/control.dev
@@ -9,7 +9,7 @@
PURPOSE = "Servo based consecutive boot test"
CRITERIA = "This test will fail if DUT fails to boot from power-off"
SUITE = "faft,faft_stress"
-TIME = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_CorruptBothFwBodyAB/control b/server/site_tests/firmware_CorruptBothFwBodyAB/control
index df2568a..67f6ff0 100644
--- a/server/site_tests/firmware_CorruptBothFwBodyAB/control
+++ b/server/site_tests/firmware_CorruptBothFwBodyAB/control
@@ -9,7 +9,7 @@
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 = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_CorruptBothFwBodyAB/control.dev b/server/site_tests/firmware_CorruptBothFwBodyAB/control.dev
index 39fdc60..6d5b099 100644
--- a/server/site_tests/firmware_CorruptBothFwBodyAB/control.dev
+++ b/server/site_tests/firmware_CorruptBothFwBodyAB/control.dev
@@ -9,7 +9,7 @@
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 = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_CorruptBothFwSigAB/control b/server/site_tests/firmware_CorruptBothFwSigAB/control
index faf52df..0e0645f 100644
--- a/server/site_tests/firmware_CorruptBothFwSigAB/control
+++ b/server/site_tests/firmware_CorruptBothFwSigAB/control
@@ -9,7 +9,7 @@
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 = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_CorruptBothFwSigAB/control.dev b/server/site_tests/firmware_CorruptBothFwSigAB/control.dev
index 3788dc2..182964a 100644
--- a/server/site_tests/firmware_CorruptBothFwSigAB/control.dev
+++ b/server/site_tests/firmware_CorruptBothFwSigAB/control.dev
@@ -9,7 +9,7 @@
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 = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_CorruptBothKernelAB/control b/server/site_tests/firmware_CorruptBothKernelAB/control
index c2d05fb..1e776e8 100644
--- a/server/site_tests/firmware_CorruptBothKernelAB/control
+++ b/server/site_tests/firmware_CorruptBothKernelAB/control
@@ -9,7 +9,7 @@
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 = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_CorruptBothKernelAB/control.dev b/server/site_tests/firmware_CorruptBothKernelAB/control.dev
index caee907..b835088 100644
--- a/server/site_tests/firmware_CorruptBothKernelAB/control.dev
+++ b/server/site_tests/firmware_CorruptBothKernelAB/control.dev
@@ -9,7 +9,7 @@
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 = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_CorruptFwBodyA/control b/server/site_tests/firmware_CorruptFwBodyA/control
index 82b27cb..1ab19d2 100644
--- a/server/site_tests/firmware_CorruptFwBodyA/control
+++ b/server/site_tests/firmware_CorruptFwBodyA/control
@@ -9,7 +9,7 @@
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 = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_CorruptFwBodyA/control.dev b/server/site_tests/firmware_CorruptFwBodyA/control.dev
index d06f92f..c63f0c1 100644
--- a/server/site_tests/firmware_CorruptFwBodyA/control.dev
+++ b/server/site_tests/firmware_CorruptFwBodyA/control.dev
@@ -9,7 +9,7 @@
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 = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_CorruptFwBodyB/control b/server/site_tests/firmware_CorruptFwBodyB/control
index 50d368b..766180c 100644
--- a/server/site_tests/firmware_CorruptFwBodyB/control
+++ b/server/site_tests/firmware_CorruptFwBodyB/control
@@ -9,7 +9,7 @@
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 = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_CorruptFwBodyB/control.dev b/server/site_tests/firmware_CorruptFwBodyB/control.dev
index b63b5f7..059250f 100644
--- a/server/site_tests/firmware_CorruptFwBodyB/control.dev
+++ b/server/site_tests/firmware_CorruptFwBodyB/control.dev
@@ -9,7 +9,7 @@
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 = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_CorruptFwSigA/control b/server/site_tests/firmware_CorruptFwSigA/control
index 8bc8120..a625954 100644
--- a/server/site_tests/firmware_CorruptFwSigA/control
+++ b/server/site_tests/firmware_CorruptFwSigA/control
@@ -9,7 +9,7 @@
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 = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_CorruptFwSigA/control.dev b/server/site_tests/firmware_CorruptFwSigA/control.dev
index 23be2cd..379704b 100644
--- a/server/site_tests/firmware_CorruptFwSigA/control.dev
+++ b/server/site_tests/firmware_CorruptFwSigA/control.dev
@@ -9,7 +9,7 @@
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 = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_CorruptFwSigB/control b/server/site_tests/firmware_CorruptFwSigB/control
index 4f178f5..fedc48f 100644
--- a/server/site_tests/firmware_CorruptFwSigB/control
+++ b/server/site_tests/firmware_CorruptFwSigB/control
@@ -9,7 +9,7 @@
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 = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_CorruptFwSigB/control.dev b/server/site_tests/firmware_CorruptFwSigB/control.dev
index 07b7713..b120d4b 100644
--- a/server/site_tests/firmware_CorruptFwSigB/control.dev
+++ b/server/site_tests/firmware_CorruptFwSigB/control.dev
@@ -9,7 +9,7 @@
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 = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_CorruptKernelA/control b/server/site_tests/firmware_CorruptKernelA/control
index fdac5ac..826eb9a 100644
--- a/server/site_tests/firmware_CorruptKernelA/control
+++ b/server/site_tests/firmware_CorruptKernelA/control
@@ -9,7 +9,7 @@
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 = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_CorruptKernelA/control.dev b/server/site_tests/firmware_CorruptKernelA/control.dev
index c5f7b48..c4619c0 100644
--- a/server/site_tests/firmware_CorruptKernelA/control.dev
+++ b/server/site_tests/firmware_CorruptKernelA/control.dev
@@ -9,7 +9,7 @@
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 = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_CorruptKernelB/control b/server/site_tests/firmware_CorruptKernelB/control
index 6998b10..757769e 100644
--- a/server/site_tests/firmware_CorruptKernelB/control
+++ b/server/site_tests/firmware_CorruptKernelB/control
@@ -9,7 +9,7 @@
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 = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_CorruptKernelB/control.dev b/server/site_tests/firmware_CorruptKernelB/control.dev
index cf79a8f..73d33fb 100644
--- a/server/site_tests/firmware_CorruptKernelB/control.dev
+++ b/server/site_tests/firmware_CorruptKernelB/control.dev
@@ -9,7 +9,7 @@
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 = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_DevBootUSB/control b/server/site_tests/firmware_DevBootUSB/control
index 890438d..35c6a98 100644
--- a/server/site_tests/firmware_DevBootUSB/control
+++ b/server/site_tests/firmware_DevBootUSB/control
@@ -9,7 +9,7 @@
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 = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_DevFwNormalBoot/control b/server/site_tests/firmware_DevFwNormalBoot/control
index fe0c94e..218ec82 100644
--- a/server/site_tests/firmware_DevFwNormalBoot/control
+++ b/server/site_tests/firmware_DevFwNormalBoot/control
@@ -9,7 +9,7 @@
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 = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_DevMode/control b/server/site_tests/firmware_DevMode/control
index 22dc3fd..0ff81b2 100644
--- a/server/site_tests/firmware_DevMode/control
+++ b/server/site_tests/firmware_DevMode/control
@@ -9,7 +9,7 @@
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 = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
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 6b86b82..3ad0540 100644
--- a/server/site_tests/firmware_DevMode/control.ec_wp
+++ b/server/site_tests/firmware_DevMode/control.ec_wp
@@ -9,7 +9,7 @@
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"
-TIME = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_DevModeStress/control b/server/site_tests/firmware_DevModeStress/control
index 1b3e5f3..1b50e73 100644
--- a/server/site_tests/firmware_DevModeStress/control
+++ b/server/site_tests/firmware_DevModeStress/control
@@ -9,8 +9,8 @@
PURPOSE = "Servo based developer firmware boot test"
CRITERIA = "This test will fail if firmware does not remain in developer mode"
SUITE = "faft,faft_stress"
-TIME = "LONG"
-TEST_CATEGORY = "Functional"
+TIME = "SHORT"
+TEST_CATEGORY = "Stress"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_DevScreenTimeout/control b/server/site_tests/firmware_DevScreenTimeout/control
index 8fcde44..ef893d3 100644
--- a/server/site_tests/firmware_DevScreenTimeout/control
+++ b/server/site_tests/firmware_DevScreenTimeout/control
@@ -9,7 +9,7 @@
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 = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_DevTriggerRecovery/control b/server/site_tests/firmware_DevTriggerRecovery/control
index c723c8a..44dfc02 100644
--- a/server/site_tests/firmware_DevTriggerRecovery/control
+++ b/server/site_tests/firmware_DevTriggerRecovery/control
@@ -9,7 +9,7 @@
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 = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_ECAdc/control b/server/site_tests/firmware_ECAdc/control
index 1c627f7..0499edf 100644
--- a/server/site_tests/firmware_ECAdc/control
+++ b/server/site_tests/firmware_ECAdc/control
@@ -8,7 +8,7 @@
NAME = "firmware_ECAdc"
PURPOSE = "Servo based EC ADC test"
CRITERIA = "This test will fail if EC ADC misbehalved."
-TIME = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_ECBattery/control b/server/site_tests/firmware_ECBattery/control
index 85dd619..71b88c3 100644
--- a/server/site_tests/firmware_ECBattery/control
+++ b/server/site_tests/firmware_ECBattery/control
@@ -9,7 +9,7 @@
PURPOSE = "Servo based EC battery status report test"
CRITERIA = "This test will fail if EC battery status report misbehalved."
SUITE = "faft,faft_ec"
-TIME = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_ECBootTime/control b/server/site_tests/firmware_ECBootTime/control
index 4457fc2..ff39a1a 100644
--- a/server/site_tests/firmware_ECBootTime/control
+++ b/server/site_tests/firmware_ECBootTime/control
@@ -9,7 +9,7 @@
PURPOSE = "Servo based EC boot time test"
CRITERIA = "This test will fail if EC did not meet boot time requirement."
SUITE = "faft,faft_ec"
-TIME = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_ECCharging/control b/server/site_tests/firmware_ECCharging/control
index da0676c..648ca07 100644
--- a/server/site_tests/firmware_ECCharging/control
+++ b/server/site_tests/firmware_ECCharging/control
@@ -9,7 +9,7 @@
PURPOSE = "Servo based EC charging control test"
CRITERIA = "This test will fail if EC charging control misbehalved."
SUITE = "faft,faft_ec"
-TIME = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_ECKeyboard/control b/server/site_tests/firmware_ECKeyboard/control
index f15b394..9e5f8b3 100644
--- a/server/site_tests/firmware_ECKeyboard/control
+++ b/server/site_tests/firmware_ECKeyboard/control
@@ -9,7 +9,7 @@
PURPOSE = "Servo based EC keyboard test"
CRITERIA = "This test will fail if EC keyboard misbehalved."
SUITE = "faft,faft_ec"
-TIME = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_ECLidSwitch/control b/server/site_tests/firmware_ECLidSwitch/control
index 33fee4d..195de5f 100644
--- a/server/site_tests/firmware_ECLidSwitch/control
+++ b/server/site_tests/firmware_ECLidSwitch/control
@@ -9,7 +9,7 @@
PURPOSE = "Servo based EC lid switch functional test"
CRITERIA = "This test will fail if EC lid switch misbehalved."
SUITE = "faft,faft_ec"
-TIME = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_ECPeci/control b/server/site_tests/firmware_ECPeci/control
index 2cb0d01..fc270cf 100644
--- a/server/site_tests/firmware_ECPeci/control
+++ b/server/site_tests/firmware_ECPeci/control
@@ -9,7 +9,7 @@
PURPOSE = "Servo based EC PECI test"
CRITERIA = "This test will fail if EC PECI misbehalved."
SUITE = "faft,faft_ec"
-TIME = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_ECPowerButton/control b/server/site_tests/firmware_ECPowerButton/control
index 178020b..285bbbe 100644
--- a/server/site_tests/firmware_ECPowerButton/control
+++ b/server/site_tests/firmware_ECPowerButton/control
@@ -9,7 +9,7 @@
PURPOSE = "Servo based EC power button functional test"
CRITERIA = "This test will fail if EC power button misbehalved."
SUITE = "faft,faft_ec"
-TIME = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_ECPowerG3/control b/server/site_tests/firmware_ECPowerG3/control
index a3d1b49..541bd5d 100644
--- a/server/site_tests/firmware_ECPowerG3/control
+++ b/server/site_tests/firmware_ECPowerG3/control
@@ -9,7 +9,7 @@
PURPOSE = "Servo based EC X86 power G3 drop test"
CRITERIA = "This test will fail if EC fails to drop to G3 correctly."
SUITE = "faft,faft_ec"
-TIME = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_ECSharedMem/control b/server/site_tests/firmware_ECSharedMem/control
index d3a075f..e9978a9 100644
--- a/server/site_tests/firmware_ECSharedMem/control
+++ b/server/site_tests/firmware_ECSharedMem/control
@@ -9,7 +9,7 @@
PURPOSE = "Servo based EC shared memory test"
CRITERIA = "This test will fail if EC shared memory misbehaved."
SUITE = "faft,faft_ec"
-TIME = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_ECThermal/control b/server/site_tests/firmware_ECThermal/control
index 7365066..3c17b9c 100644
--- a/server/site_tests/firmware_ECThermal/control
+++ b/server/site_tests/firmware_ECThermal/control
@@ -9,7 +9,7 @@
PURPOSE = "Servo based EC thermal engine test"
CRITERIA = "This test will fail if EC thermal engine misbehalved."
SUITE = "faft,faft_ec"
-TIME = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_ECUsbPorts/control b/server/site_tests/firmware_ECUsbPorts/control
index 0a22508..0711be6 100644
--- a/server/site_tests/firmware_ECUsbPorts/control
+++ b/server/site_tests/firmware_ECUsbPorts/control
@@ -9,7 +9,7 @@
PURPOSE = "Servo based EC USB ports test"
CRITERIA = "This test will fail if EC USB port control misbehalved."
SUITE = "faft,faft_ec"
-TIME = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_ECWakeSource/control b/server/site_tests/firmware_ECWakeSource/control
index e9c1d06..e646d62 100644
--- a/server/site_tests/firmware_ECWakeSource/control
+++ b/server/site_tests/firmware_ECWakeSource/control
@@ -9,7 +9,7 @@
PURPOSE = "Servo based EC wake source test"
CRITERIA = "This test will fail if EC wake source misbehalved."
SUITE = "faft,faft_ec"
-TIME = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_ECWatchdog/control b/server/site_tests/firmware_ECWatchdog/control
index a3b62a0..7e3968a 100644
--- a/server/site_tests/firmware_ECWatchdog/control
+++ b/server/site_tests/firmware_ECWatchdog/control
@@ -9,7 +9,7 @@
PURPOSE = "Servo based EC watchdog test"
CRITERIA = "This test will fail if EC watchdog misbehalved."
SUITE = "faft,faft_ec"
-TIME = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_ECWriteProtect/control b/server/site_tests/firmware_ECWriteProtect/control
index df6f8aa..5a66d0f 100644
--- a/server/site_tests/firmware_ECWriteProtect/control
+++ b/server/site_tests/firmware_ECWriteProtect/control
@@ -9,7 +9,7 @@
PURPOSE = "Servo based EC write protect test"
CRITERIA = "This test will fail if EC write protect misbehaved"
SUITE = "faft,faft_ec"
-TIME = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_ECWriteProtect/control.dev b/server/site_tests/firmware_ECWriteProtect/control.dev
index 4f1866c..93984d4 100644
--- a/server/site_tests/firmware_ECWriteProtect/control.dev
+++ b/server/site_tests/firmware_ECWriteProtect/control.dev
@@ -8,7 +8,7 @@
NAME = "firmware_ECWriteProtect"
PURPOSE = "Servo based EC write protect test"
CRITERIA = "This test will fail if EC write protect misbehaved"
-TIME = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_FAFTSetup/control b/server/site_tests/firmware_FAFTSetup/control
index d9b0669..eb1f2f4 100644
--- a/server/site_tests/firmware_FAFTSetup/control
+++ b/server/site_tests/firmware_FAFTSetup/control
@@ -9,7 +9,7 @@
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"
-TIME = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_FwScreenCloseLid/control b/server/site_tests/firmware_FwScreenCloseLid/control
index f209bfa..819f6e0 100644
--- a/server/site_tests/firmware_FwScreenCloseLid/control
+++ b/server/site_tests/firmware_FwScreenCloseLid/control
@@ -9,7 +9,7 @@
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 = "LONG"
+TIME = "MEDIUM"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_FwScreenPressPower/control b/server/site_tests/firmware_FwScreenPressPower/control
index 8e3f00b..cac3eb9 100644
--- a/server/site_tests/firmware_FwScreenPressPower/control
+++ b/server/site_tests/firmware_FwScreenPressPower/control
@@ -9,7 +9,7 @@
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 = "LONG"
+TIME = "MEDIUM"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_InvalidUSB/control b/server/site_tests/firmware_InvalidUSB/control
index 3170210..8143665 100644
--- a/server/site_tests/firmware_InvalidUSB/control
+++ b/server/site_tests/firmware_InvalidUSB/control
@@ -9,7 +9,7 @@
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 = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_RONormalBoot/control b/server/site_tests/firmware_RONormalBoot/control
index db7e886..721e34f 100644
--- a/server/site_tests/firmware_RONormalBoot/control
+++ b/server/site_tests/firmware_RONormalBoot/control
@@ -9,7 +9,7 @@
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 = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_RONormalBoot/control.dev b/server/site_tests/firmware_RONormalBoot/control.dev
index 9bea459..2dadc73 100644
--- a/server/site_tests/firmware_RONormalBoot/control.dev
+++ b/server/site_tests/firmware_RONormalBoot/control.dev
@@ -9,7 +9,7 @@
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 = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_RecoveryButton/control b/server/site_tests/firmware_RecoveryButton/control
index b12e9c3..b205637 100644
--- a/server/site_tests/firmware_RecoveryButton/control
+++ b/server/site_tests/firmware_RecoveryButton/control
@@ -9,7 +9,7 @@
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 = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_RecoveryButton/control.dev b/server/site_tests/firmware_RecoveryButton/control.dev
index 450a1ef..77b842a 100644
--- a/server/site_tests/firmware_RecoveryButton/control.dev
+++ b/server/site_tests/firmware_RecoveryButton/control.dev
@@ -9,7 +9,7 @@
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 = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_RecoveryButton/control.ec_wp b/server/site_tests/firmware_RecoveryButton/control.ec_wp
index dfa8420..d19292a 100644
--- a/server/site_tests/firmware_RecoveryButton/control.ec_wp
+++ b/server/site_tests/firmware_RecoveryButton/control.ec_wp
@@ -9,7 +9,7 @@
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"
-TIME = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_RollbackFirmware/control b/server/site_tests/firmware_RollbackFirmware/control
index 15f0eca..ffc00ec 100644
--- a/server/site_tests/firmware_RollbackFirmware/control
+++ b/server/site_tests/firmware_RollbackFirmware/control
@@ -9,7 +9,7 @@
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 = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_RollbackFirmware/control.dev b/server/site_tests/firmware_RollbackFirmware/control.dev
index cc7b022..a8f5570 100644
--- a/server/site_tests/firmware_RollbackFirmware/control.dev
+++ b/server/site_tests/firmware_RollbackFirmware/control.dev
@@ -9,7 +9,7 @@
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 = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_RollbackKernel/control b/server/site_tests/firmware_RollbackKernel/control
index 9260326..094d0d4 100644
--- a/server/site_tests/firmware_RollbackKernel/control
+++ b/server/site_tests/firmware_RollbackKernel/control
@@ -9,7 +9,7 @@
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 = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_RollbackKernel/control.dev b/server/site_tests/firmware_RollbackKernel/control.dev
index d55fe29..5b210c3 100644
--- a/server/site_tests/firmware_RollbackKernel/control.dev
+++ b/server/site_tests/firmware_RollbackKernel/control.dev
@@ -9,7 +9,7 @@
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 = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_ShellBall/control b/server/site_tests/firmware_ShellBall/control
index 996637b..c626338 100644
--- a/server/site_tests/firmware_ShellBall/control
+++ b/server/site_tests/firmware_ShellBall/control
@@ -6,7 +6,7 @@
AUTHOR = "Chrome OS Team"
NAME = "firmware_ShellBall"
-TIME = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_SoftwareSync/control b/server/site_tests/firmware_SoftwareSync/control
index 729f99d..5551eba 100644
--- a/server/site_tests/firmware_SoftwareSync/control
+++ b/server/site_tests/firmware_SoftwareSync/control
@@ -9,7 +9,7 @@
PURPOSE = "Servo based EC software sync test"
CRITERIA = "This test will fail if EC software sync misbehalved"
SUITE = "faft,faft_ec"
-TIME = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_SoftwareSync/control.dev b/server/site_tests/firmware_SoftwareSync/control.dev
index a77b26a..c236ee1 100644
--- a/server/site_tests/firmware_SoftwareSync/control.dev
+++ b/server/site_tests/firmware_SoftwareSync/control.dev
@@ -8,7 +8,7 @@
NAME = "firmware_SoftwareSync"
PURPOSE = "Servo based EC software sync test"
CRITERIA = "This test will fail if EC software sync misbehalved"
-TIME = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_TryFwB/control b/server/site_tests/firmware_TryFwB/control
index 18c1404..fb139e4 100644
--- a/server/site_tests/firmware_TryFwB/control
+++ b/server/site_tests/firmware_TryFwB/control
@@ -9,7 +9,7 @@
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 = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_TryFwB/control.dev b/server/site_tests/firmware_TryFwB/control.dev
index 934b802..7c0483f 100644
--- a/server/site_tests/firmware_TryFwB/control.dev
+++ b/server/site_tests/firmware_TryFwB/control.dev
@@ -9,7 +9,7 @@
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 = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_TryFwB/control.ec_wp b/server/site_tests/firmware_TryFwB/control.ec_wp
index 02470d8..4947cbf 100644
--- a/server/site_tests/firmware_TryFwB/control.ec_wp
+++ b/server/site_tests/firmware_TryFwB/control.ec_wp
@@ -9,7 +9,7 @@
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"
-TIME = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_UpdateECBin/control b/server/site_tests/firmware_UpdateECBin/control
index fdf2844..cad1a8c 100644
--- a/server/site_tests/firmware_UpdateECBin/control
+++ b/server/site_tests/firmware_UpdateECBin/control
@@ -9,7 +9,7 @@
PURPOSE = "Servo based software sync EC update test"
CRITERIA = "This test will fail if software sync failed on EC update"
SUITE = "faft_update_ec"
-TIME = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_UpdateECBin/control.dev b/server/site_tests/firmware_UpdateECBin/control.dev
index 3bf2ad8..d45e523 100644
--- a/server/site_tests/firmware_UpdateECBin/control.dev
+++ b/server/site_tests/firmware_UpdateECBin/control.dev
@@ -9,7 +9,7 @@
PURPOSE = "Servo based software sync EC update test"
CRITERIA = "This test will fail if software sync failed on EC update"
SUITE = "faft_update_ec"
-TIME = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_UpdateFirmwareDataKeyVersion/control b/server/site_tests/firmware_UpdateFirmwareDataKeyVersion/control
index 9c31421..366bae0 100644
--- a/server/site_tests/firmware_UpdateFirmwareDataKeyVersion/control
+++ b/server/site_tests/firmware_UpdateFirmwareDataKeyVersion/control
@@ -20,7 +20,7 @@
2. Firmware datakey version does not match original datakey version.
"""
SUITE = "faft_update"
-TIME = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_UpdateFirmwareVersion/control b/server/site_tests/firmware_UpdateFirmwareVersion/control
index d545ebf..c26c32f 100644
--- a/server/site_tests/firmware_UpdateFirmwareVersion/control
+++ b/server/site_tests/firmware_UpdateFirmwareVersion/control
@@ -21,7 +21,7 @@
4. Firmware version does not recover to original version after recovery.
"""
SUITE = "faft_update"
-TIME = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_UpdateKernelDataKeyVersion/control b/server/site_tests/firmware_UpdateKernelDataKeyVersion/control
index be9fea5..13b859e 100644
--- a/server/site_tests/firmware_UpdateKernelDataKeyVersion/control
+++ b/server/site_tests/firmware_UpdateKernelDataKeyVersion/control
@@ -18,7 +18,7 @@
5. Kernel datakey version does not recover to original version after recovery.
"""
SUITE = "faft,faft_update"
-TIME = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_UpdateKernelSubkeyVersion/control b/server/site_tests/firmware_UpdateKernelSubkeyVersion/control
index b34a4b2..d717487 100644
--- a/server/site_tests/firmware_UpdateKernelSubkeyVersion/control
+++ b/server/site_tests/firmware_UpdateKernelSubkeyVersion/control
@@ -15,7 +15,7 @@
2. Kernel subkey version does not match original kernel subkey version.
"""
SUITE = "faft_update"
-TIME = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_UpdateKernelVersion/control b/server/site_tests/firmware_UpdateKernelVersion/control
index 009e7fe..d6ddc47 100644
--- a/server/site_tests/firmware_UpdateKernelVersion/control
+++ b/server/site_tests/firmware_UpdateKernelVersion/control
@@ -16,7 +16,7 @@
5. Kernel version does not recover to original version after recovery.
"""
SUITE = "faft,faft_update"
-TIME = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_UserRequestRecovery/control b/server/site_tests/firmware_UserRequestRecovery/control
index a9d05ae..76fd8cf 100644
--- a/server/site_tests/firmware_UserRequestRecovery/control
+++ b/server/site_tests/firmware_UserRequestRecovery/control
@@ -9,7 +9,7 @@
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 = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_UserRequestRecovery/control.dev b/server/site_tests/firmware_UserRequestRecovery/control.dev
index c1c9fc7..c2a61ca 100644
--- a/server/site_tests/firmware_UserRequestRecovery/control.dev
+++ b/server/site_tests/firmware_UserRequestRecovery/control.dev
@@ -9,7 +9,7 @@
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 = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/firmware_UserRequestRecovery/control.ec_wp b/server/site_tests/firmware_UserRequestRecovery/control.ec_wp
index 58491d1..4092854 100644
--- a/server/site_tests/firmware_UserRequestRecovery/control.ec_wp
+++ b/server/site_tests/firmware_UserRequestRecovery/control.ec_wp
@@ -9,7 +9,7 @@
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"
-TIME = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "firmware"
TEST_TYPE = "server"
diff --git a/server/site_tests/suites/control.faft_bios b/server/site_tests/suites/control.faft_bios
index dc8afad..692efac 100644
--- a/server/site_tests/suites/control.faft_bios
+++ b/server/site_tests/suites/control.faft_bios
@@ -6,7 +6,7 @@
AUTHOR = "Chrome OS Team"
NAME = "FAFT BIOS"
-TIME = "LONG"
+TIME = "MEDIUM"
TEST_CATEGORY = "Functional"
TEST_CLASS = "suite"
TEST_TYPE = "server"
diff --git a/server/site_tests/suites/control.faft_lv1 b/server/site_tests/suites/control.faft_lv1
index 82834af..ec8a595 100644
--- a/server/site_tests/suites/control.faft_lv1
+++ b/server/site_tests/suites/control.faft_lv1
@@ -6,7 +6,7 @@
AUTHOR = "Chrome OS Team"
NAME = "FAFT LV1"
-TIME = "LONG"
+TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "suite"
TEST_TYPE = "server"
diff --git a/server/site_tests/suites/control.faft_lv2 b/server/site_tests/suites/control.faft_lv2
index 8cc33e2..50b1642 100644
--- a/server/site_tests/suites/control.faft_lv2
+++ b/server/site_tests/suites/control.faft_lv2
@@ -6,7 +6,7 @@
AUTHOR = "Chrome OS Team"
NAME = "FAFT LV2"
-TIME = "LONG"
+TIME = "MEDIUM"
TEST_CATEGORY = "Functional"
TEST_CLASS = "suite"
TEST_TYPE = "server"
diff --git a/server/site_tests/suites/control.faft_lv3 b/server/site_tests/suites/control.faft_lv3
index 4c6db60..4492579 100644
--- a/server/site_tests/suites/control.faft_lv3
+++ b/server/site_tests/suites/control.faft_lv3
@@ -6,7 +6,7 @@
AUTHOR = "Chrome OS Team"
NAME = "FAFT LV3"
-TIME = "LONG"
+TIME = "MEDIUM"
TEST_CATEGORY = "Functional"
TEST_CLASS = "suite"
TEST_TYPE = "server"
diff --git a/server/site_tests/suites/control.faft_lv4 b/server/site_tests/suites/control.faft_lv4
index aae6b86..445dcc2 100644
--- a/server/site_tests/suites/control.faft_lv4
+++ b/server/site_tests/suites/control.faft_lv4
@@ -6,7 +6,7 @@
AUTHOR = "Chrome OS Team"
NAME = "FAFT LV4"
-TIME = "LONG"
+TIME = "MEDIUM"
TEST_CATEGORY = "Functional"
TEST_CLASS = "suite"
TEST_TYPE = "server"