Manually perform config-update from build_config.ToT.json
Manually perform the config update for the file coming out of GE:
gsutil cp gs://chromeos-build-release-console/build_config.ToT.json config/ge_build_config.json
cros_sdk -- /mnt/host/source/chromite/config/refresh_generated_files
./run_pytest config/chromeos_config_unittest.py
It seems to be working fine but is failing when coming through the
config-updater. This unbreaks ToT chromite tests.
BUG=chromium:1120088
TEST=above steps performing config-updater work
Change-Id: I5ecb393c9f6b3417eb67111218779239ad6e6829
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2368218
Reviewed-by: David Riley <davidriley@chromium.org>
Reviewed-by: David Burger <dburger@chromium.org>
Commit-Queue: David Burger <dburger@chromium.org>
Tested-by: David Burger <dburger@chromium.org>
diff --git a/config/config_dump.json b/config/config_dump.json
index ece28cf..8d298a5 100644
--- a/config/config_dump.json
+++ b/config/config_dump.json
@@ -34197,6 +34197,43 @@
"luci_builder": "Try",
"usepkg_toolchain": false
},
+ "zork-borealis-full": {
+ "_template": "full",
+ "boards": [
+ "zork-borealis"
+ ],
+ "prebuilts": "public",
+ "run_cpeexport": true,
+ "useflags": [
+ "-chrome_internal"
+ ],
+ "vm_tests": []
+ },
+ "zork-borealis-full-tryjob": {
+ "_template": "full",
+ "boards": [
+ "zork-borealis"
+ ],
+ "debug": true,
+ "display_label": "tryjob",
+ "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",
+ "prebuilts": "public",
+ "run_cpeexport": true,
+ "useflags": [
+ "-chrome_internal"
+ ],
+ "vm_tests": []
+ },
"zork-borealis-llvm-next-toolchain": {
"_template": "llvm_next_toolchain",
"boards": [
@@ -34229,12 +34266,29 @@
"hw_tests_override": null,
"luci_builder": "Try"
},
+ "zork-borealis-payloads": {
+ "_template": "payloads",
+ "boards": [
+ "zork-borealis"
+ ]
+ },
+ "zork-borealis-payloads-tryjob": {
+ "_template": "payloads",
+ "boards": [
+ "zork-borealis"
+ ],
+ "debug": true,
+ "hw_tests_override": null,
+ "luci_builder": "Try"
+ },
"zork-borealis-release": {
"_template": "release",
"boards": [
"zork-borealis"
],
- "important": false
+ "important": false,
+ "vm_tests": [],
+ "vm_tests_override": null
},
"zork-borealis-release-tryjob": {
"_template": "release",
@@ -34257,8 +34311,24 @@
"paygen": false,
"push_image": false,
"suite_scheduling": false,
+ "vm_tests": [],
"vm_tests_override": null
},
+ "zork-borealis-unittest-stress": {
+ "_template": "unittest_stress",
+ "boards": [
+ "zork-borealis"
+ ],
+ "hw_tests_override": null,
+ "internal": true,
+ "luci_builder": "Try",
+ "manifest": "official.xml",
+ "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+ "overlays": "both",
+ "useflags": [
+ "chrome_internal"
+ ]
+ },
"zork-full": {
"_template": "full",
"boards": [
diff --git a/config/ge_build_config.json b/config/ge_build_config.json
index 19a8e8e..a0734cb 100644
--- a/config/ge_build_config.json
+++ b/config/ge_build_config.json
@@ -1080,7 +1080,7 @@
"experimental": true,
"leader_board": false,
"board_group": "",
- "arch": "UNKNOWN"
+ "arch": "X86_INTERNAL"
}
]
}
diff --git a/config/waterfall_layout_dump.txt b/config/waterfall_layout_dump.txt
index 302022f..65dafe3 100644
--- a/config/waterfall_layout_dump.txt
+++ b/config/waterfall_layout_dump.txt
@@ -1977,9 +1977,12 @@
x32-generic-llvm-next-toolchain-tryjob
x32-generic-llvm-toolchain-tryjob
x32-generic-unittest-stress
+ zork-borealis-full-tryjob
zork-borealis-llvm-next-toolchain-tryjob
zork-borealis-llvm-toolchain-tryjob
+ zork-borealis-payloads-tryjob
zork-borealis-release-tryjob
+ zork-borealis-unittest-stress
zork-full-tryjob
zork-kernelnext-full-tryjob
zork-kernelnext-llvm-next-toolchain-tryjob
