Re-enable drallion hardware tests.
https://b.corp.google.com/issues/160005408 has been resolved now
so we should be able to run hardware tests on Drallion now.
BUG=chromium:1120812
TEST=n/a
Change-Id: I6c8e5023d5895a1630e862fddf2612c563ac3e1e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2370408
Commit-Queue: Sean McAllister <smcallis@google.com>
Tested-by: Sean McAllister <smcallis@google.com>
Auto-Submit: Sean McAllister <smcallis@google.com>
Reviewed-by: David Burger <dburger@chromium.org>
diff --git a/config/chromeos_config.py b/config/chromeos_config.py
index 236e166..1ca5c4b 100644
--- a/config/chromeos_config.py
+++ b/config/chromeos_config.py
@@ -2555,9 +2555,6 @@
},
'drallion-release': {
- 'hw_tests': [],
- 'hw_tests_override': [],
- 'hw_tests_disabled_bug': 'https://b.corp.google.com/issues/160005408',
'sign_types': ['recovery', 'factory'],
},
@@ -2580,8 +2577,8 @@
# Some Unibuild boards need to have hardware tests disabled. This means
# disabling it at the model level as well.
_unibuild_disabled_hw_tests = frozenset([
- 'drallion-release', # b/160005408.
])
+
for config_name in _unibuild_disabled_hw_tests:
config = site_config.get(config_name)
if config and 'models' in config:
diff --git a/config/config_dump.json b/config/config_dump.json
index 838675f..9824788 100644
--- a/config/config_dump.json
+++ b/config/config_dump.json
@@ -8883,12 +8883,9 @@
"boards": [
"drallion"
],
- "hw_tests": [],
- "hw_tests_disabled_bug": "https://b.corp.google.com/issues/160005408",
- "hw_tests_override": [],
"models": [
- "{\n \"enable_skylab\": true,\n \"lab_board_name\": \"drallion\",\n \"name\": \"drallion\",\n \"test_suites\": []\n}",
- "{\n \"enable_skylab\": true,\n \"lab_board_name\": \"drallion\",\n \"name\": \"drallion360\",\n \"test_suites\": []\n}",
+ "{\n \"enable_skylab\": true,\n \"lab_board_name\": \"drallion\",\n \"name\": \"drallion\",\n \"test_suites\": [\n \"sanity\",\n \"bvt-inline\",\n \"bvt-tast-cq\",\n \"bvt-installer\",\n \"bvt-arc\",\n \"au\",\n \"bvt-cq\",\n \"bvt-perbuild\",\n \"bvt-tast-informational\"\n ]\n}",
+ "{\n \"enable_skylab\": true,\n \"lab_board_name\": \"drallion\",\n \"name\": \"drallion360\",\n \"test_suites\": [\n \"sanity\",\n \"bvt-inline\",\n \"bvt-tast-cq\",\n \"bvt-installer\",\n \"bvt-arc\",\n \"au\",\n \"bvt-cq\",\n \"bvt-perbuild\",\n \"bvt-tast-informational\"\n ]\n}",
"{\n \"enable_skylab\": true,\n \"lab_board_name\": \"drallion\",\n \"name\": \"drallion360_signed\",\n \"test_suites\": []\n}",
"{\n \"enable_skylab\": true,\n \"lab_board_name\": \"drallion\",\n \"name\": \"drallion_signed\",\n \"test_suites\": []\n}"
],
@@ -8906,13 +8903,20 @@
],
"debug": true,
"display_label": "tryjob",
- "hw_tests": [],
- "hw_tests_disabled_bug": "https://b.corp.google.com/issues/160005408",
+ "hw_tests": [
+ "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"enable_skylab\": true,\n \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"offload_failures_only\": false,\n \"pool\": \"quota\",\n \"priority\": \"Build\",\n \"quota_account\": \"legacypool-suites\",\n \"retry\": true,\n \"suite\": \"bvt-inline\",\n \"suite_args\": null,\n \"suite_min_duts\": 0,\n \"timeout\": 10800,\n \"warn_only\": false\n}",
+ "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"enable_skylab\": true,\n \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"offload_failures_only\": false,\n \"pool\": \"quota\",\n \"priority\": \"Build\",\n \"quota_account\": \"legacypool-suites\",\n \"retry\": true,\n \"suite\": \"bvt-arc\",\n \"suite_args\": null,\n \"suite_min_duts\": 0,\n \"timeout\": 10800,\n \"warn_only\": false\n}",
+ "{\n \"async\": false,\n \"blocking\": false,\n \"critical\": false,\n \"enable_skylab\": true,\n \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"offload_failures_only\": false,\n \"pool\": \"quota\",\n \"priority\": \"Build\",\n \"quota_account\": \"legacypool-suites\",\n \"retry\": true,\n \"suite\": \"bvt-tast-cq\",\n \"suite_args\": null,\n \"suite_min_duts\": 0,\n \"timeout\": 10800,\n \"warn_only\": false\n}",
+ "{\n \"async\": true,\n \"blocking\": false,\n \"critical\": false,\n \"enable_skylab\": true,\n \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"offload_failures_only\": false,\n \"pool\": \"quota\",\n \"priority\": \"PostBuild\",\n \"quota_account\": \"legacypool-suites\",\n \"retry\": true,\n \"suite\": \"bvt-tast-informational\",\n \"suite_args\": null,\n \"suite_min_duts\": 1,\n \"timeout\": 15000,\n \"warn_only\": false\n}",
+ "{\n \"async\": false,\n \"blocking\": true,\n \"critical\": false,\n \"enable_skylab\": true,\n \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"offload_failures_only\": false,\n \"pool\": \"quota\",\n \"priority\": \"CQ\",\n \"quota_account\": \"bvt-sync\",\n \"retry\": true,\n \"suite\": \"bvt-installer\",\n \"suite_args\": null,\n \"suite_min_duts\": 0,\n \"timeout\": 10800,\n \"warn_only\": false\n}",
+ "{\n \"async\": true,\n \"blocking\": false,\n \"critical\": false,\n \"enable_skylab\": true,\n \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"offload_failures_only\": false,\n \"pool\": \"quota\",\n \"priority\": \"PostBuild\",\n \"quota_account\": \"legacypool-suites\",\n \"retry\": true,\n \"suite\": \"bvt-cq\",\n \"suite_args\": null,\n \"suite_min_duts\": 1,\n \"timeout\": 15000,\n \"warn_only\": false\n}",
+ "{\n \"async\": true,\n \"blocking\": false,\n \"critical\": false,\n \"enable_skylab\": true,\n \"file_bugs\": false,\n \"max_retries\": 5,\n \"minimum_duts\": 0,\n \"offload_failures_only\": false,\n \"pool\": \"quota\",\n \"priority\": \"PostBuild\",\n \"quota_account\": \"legacypool-suites\",\n \"retry\": true,\n \"suite\": \"bvt-perbuild\",\n \"suite_args\": null,\n \"suite_min_duts\": 1,\n \"timeout\": 15000,\n \"warn_only\": false\n}"
+ ],
"hw_tests_override": null,
"luci_builder": "Try",
"models": [
- "{\n \"enable_skylab\": true,\n \"lab_board_name\": \"drallion\",\n \"name\": \"drallion\",\n \"test_suites\": []\n}",
- "{\n \"enable_skylab\": true,\n \"lab_board_name\": \"drallion\",\n \"name\": \"drallion360\",\n \"test_suites\": []\n}",
+ "{\n \"enable_skylab\": true,\n \"lab_board_name\": \"drallion\",\n \"name\": \"drallion\",\n \"test_suites\": [\n \"sanity\",\n \"bvt-inline\",\n \"bvt-tast-cq\",\n \"bvt-installer\",\n \"bvt-arc\",\n \"au\",\n \"bvt-cq\",\n \"bvt-perbuild\",\n \"bvt-tast-informational\"\n ]\n}",
+ "{\n \"enable_skylab\": true,\n \"lab_board_name\": \"drallion\",\n \"name\": \"drallion360\",\n \"test_suites\": [\n \"sanity\",\n \"bvt-inline\",\n \"bvt-tast-cq\",\n \"bvt-installer\",\n \"bvt-arc\",\n \"au\",\n \"bvt-cq\",\n \"bvt-perbuild\",\n \"bvt-tast-informational\"\n ]\n}",
"{\n \"enable_skylab\": true,\n \"lab_board_name\": \"drallion\",\n \"name\": \"drallion360_signed\",\n \"test_suites\": []\n}",
"{\n \"enable_skylab\": true,\n \"lab_board_name\": \"drallion\",\n \"name\": \"drallion_signed\",\n \"test_suites\": []\n}"
],
