Further disable drallion hw tests due to rework on drallion360 DUTS.
BUG=b:160005408, chromium:1104901
TEST=./refresh_regenerated_files
Change-Id: I7c052c614fcb2e6b14948cda6eed16f2d25ea6b3
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2296505
Tested-by: LaMont Jones <lamontjones@chromium.org>
Reviewed-by: David Burger <dburger@chromium.org>
Reviewed-by: Prathmesh Prabhu <pprabhu@chromium.org>
Commit-Queue: LaMont Jones <lamontjones@chromium.org>
(cherry picked from commit 34af3e195382faefe375ff7ee3fc6ff649dbc01e)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2297230
Reviewed-by: Marina Kazatcker <marinakz@google.com>
diff --git a/config/chromeos_config.py b/config/chromeos_config.py
index b35fc2e..1d99b07 100644
--- a/config/chromeos_config.py
+++ b/config/chromeos_config.py
@@ -2734,6 +2734,23 @@
}
+ # 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:
+ models = []
+ for model in config['models']:
+ models.append(
+ config_lib.ModelTestConfig(
+ model.name,
+ model.lab_board_name, [],
+ enable_skylab=model.enable_skylab))
+ overwritten_configs[config_name]['models'] = models
+
# Some boards in toolchain builder are not using the same configuration as
# release builders. Configure it here since it's easier, for both
# llvm-toolchain and llvm-next-toolchain builders.
diff --git a/config/config_dump.json b/config/config_dump.json
index 068088e..2e228e4 100644
--- a/config/config_dump.json
+++ b/config/config_dump.json
@@ -8104,8 +8104,8 @@
"drallion"
],
"models": [
- "{\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\": \"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\": \"drallion360_signed\",\n \"test_suites\": []\n}",
"{\n \"enable_skylab\": true,\n \"lab_board_name\": \"drallion\",\n \"name\": \"drallion_signed\",\n \"test_suites\": []\n}"
],
@@ -8135,8 +8135,8 @@
"hw_tests_override": null,
"luci_builder": "Try",
"models": [
- "{\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\": \"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\": \"drallion360_signed\",\n \"test_suites\": []\n}",
"{\n \"enable_skylab\": true,\n \"lab_board_name\": \"drallion\",\n \"name\": \"drallion_signed\",\n \"test_suites\": []\n}"
],
