hardware_StorageQual: Reorder tests in storage_qual_quick suite
This CL fixes up CL:2677069.
Ideally the storage_qual_quick suite should have the same order as the
full one.
BUG=b:179445300
TEST=manual checking the generated control files
Change-Id: Ice8790bb4ee60829b84f51364ec2df02a720a743
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2933037
Reviewed-by: David Jimenez <dvjimenez@chromium.org>
Reviewed-by: Alex Bergman <abergman@google.com>
Tested-by: Alex Bergman <abergman@google.com>
Commit-Queue: Fei Shao <fshao@chromium.org>
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualSuspendStress_suspend_suspend_0 b/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualSuspendStress_suspend_suspend_0
index 82f5c5d..d07447b 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualSuspendStress_suspend_suspend_0
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualSuspendStress_suspend_suspend_0
@@ -17,7 +17,7 @@
TEST_CLASS = "Hardware"
TEST_TYPE = "server"
REQUIRE_SSP = True
-PRIORITY = 80
+PRIORITY = 60
DEPENDENCIES = "suspend"
JOB_RETRIES = 0
FAST = False
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualSuspendStress_suspend_suspend_1 b/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualSuspendStress_suspend_suspend_1
index 87a5a50..5bef6fd 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualSuspendStress_suspend_suspend_1
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualSuspendStress_suspend_suspend_1
@@ -17,7 +17,7 @@
TEST_CLASS = "Hardware"
TEST_TYPE = "server"
REQUIRE_SSP = True
-PRIORITY = 80
+PRIORITY = 60
DEPENDENCIES = "suspend"
JOB_RETRIES = 0
FAST = False
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualTrimStress_trim_0 b/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualTrimStress_trim_0
index 5634b16..7623d71 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualTrimStress_trim_0
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualTrimStress_trim_0
@@ -17,7 +17,7 @@
TEST_CLASS = "Hardware"
TEST_TYPE = "server"
REQUIRE_SSP = True
-PRIORITY = 80
+PRIORITY = 60
DEPENDENCIES = "trim"
JOB_RETRIES = 0
FAST = False
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualTrimStress_trim_1 b/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualTrimStress_trim_1
index 773e03d..8b80c5b 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualTrimStress_trim_1
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageQualTrimStress_trim_1
@@ -17,7 +17,7 @@
TEST_CLASS = "Hardware"
TEST_TYPE = "server"
REQUIRE_SSP = True
-PRIORITY = 80
+PRIORITY = 60
DEPENDENCIES = "trim"
JOB_RETRIES = 0
FAST = False
diff --git a/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageStress_retention_suspend b/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageStress_retention_suspend
index e51e38d..35cbc48 100644
--- a/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageStress_retention_suspend
+++ b/server/site_tests/hardware_StorageQual/control.storage_qual_quick_hardware_StorageStress_retention_suspend
@@ -17,7 +17,7 @@
TEST_CLASS = "Hardware"
TEST_TYPE = "server"
REQUIRE_SSP = True
-PRIORITY = 80
+PRIORITY = 60
DEPENDENCIES = "retention"
JOB_RETRIES = 0
FAST = False
diff --git a/server/site_tests/hardware_StorageQual/generate_storage_qual_control_files.py b/server/site_tests/hardware_StorageQual/generate_storage_qual_control_files.py
index 63b1e01..be17b6f 100644
--- a/server/site_tests/hardware_StorageQual/generate_storage_qual_control_files.py
+++ b/server/site_tests/hardware_StorageQual/generate_storage_qual_control_files.py
@@ -158,7 +158,7 @@
'label':
'retention',
'tests': [
- CHECK_SETUP, BASE_BEFORE, SOAK_QUICK, {
+ CHECK_SETUP, BASE_BEFORE, SOAK_QUICK, BASE_AFTER, {
'test': 'hardware_StorageStress',
'args': {
'tag': 'suspend',
@@ -167,41 +167,41 @@
'suspend_duration': 120,
'duration': HOUR_IN_SECS / 2
},
- 'priority': 80,
+ 'priority': 60,
'length': 'long',
'ssp': True
- }, BASE_AFTER
+ }
]
}, {
'label':
'suspend',
'tests': [
- BASE_BEFORE, SOAK_QUICK, {
+ BASE_BEFORE, SOAK_QUICK, BASE_AFTER, {
'test': 'hardware_StorageQualSuspendStress',
'args': {
'tag': 'suspend',
'duration': HOUR_IN_SECS / 2
},
'iterations': 2,
- 'priority': 80,
+ 'priority': 60,
'length': 'long',
'ssp': True
- }, BASE_AFTER
+ }
]
}, {
'label':
'trim',
'tests': [
- BASE_BEFORE, SOAK_QUICK, {
+ BASE_BEFORE, SOAK_QUICK, BASE_AFTER, {
'test': 'hardware_StorageQualTrimStress',
'args': {
'duration': HOUR_IN_SECS / 2
},
'iterations': 2,
- 'priority': 80,
+ 'priority': 60,
'length': 'long',
'ssp': True
- }, BASE_AFTER
+ }
]
}],
'storage_qual_external': [{
