chromiumos-sdk & informational config: switch to main branch
These external branch builders needs to track main. Added a todo to
examine this config in the future for simplicity.
BUG=chromium:1159924
TEST=./regenerate_configs.sh
Change-Id: I24d4c8eb594b0d901b88ac2c9c7c159544a1cc5a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2597939
Commit-Queue: George Engelbrecht <engeg@google.com>
Commit-Queue: Manoj Gupta <manojgupta@chromium.org>
Tested-by: George Engelbrecht <engeg@google.com>
Auto-Submit: George Engelbrecht <engeg@google.com>
Reviewed-by: Manoj Gupta <manojgupta@chromium.org>
diff --git a/config/chromeos_config.py b/config/chromeos_config.py
index ac19485..0b530e3 100644
--- a/config/chromeos_config.py
+++ b/config/chromeos_config.py
@@ -197,6 +197,7 @@
'informational',
display_label=config_lib.DISPLAY_LABEL_INFORMATIONAL,
description='Informational Builds',
+ manifest_branch='main',
luci_builder=config_lib.LUCI_BUILDER_INFORMATIONAL,
)
@@ -2759,6 +2760,11 @@
site_config.templates.no_hwtest_builder,
# The amd64-host has to be last as that is when the toolchains
# are bundled up for inclusion in the sdk.
+ #
+ # TODO(crbug.com/1159924): Audit this and other builder's branch
+ # since we deprecated the old external tracking branch.
+ manifest_branch='main',
+
boards=[
'arm-generic', 'amd64-generic'
],
diff --git a/config/config_dump.json b/config/config_dump.json
index 2bcc932..3d9cc6f 100644
--- a/config/config_dump.json
+++ b/config/config_dump.json
@@ -346,6 +346,7 @@
"image_test": true,
"images": [],
"luci_builder": "Informational",
+ "manifest_branch": "main",
"packages": [
"virtual/target-fuzzers"
],
@@ -376,7 +377,8 @@
"_template": "informational",
"description": "Informational Builds",
"display_label": "informational",
- "luci_builder": "Informational"
+ "luci_builder": "Informational",
+ "manifest_branch": "main"
},
"llvm_next_toolchain": {
"_template": "llvm_next_toolchain",
@@ -1045,6 +1047,7 @@
"doc": "https://dev.chromium.org/chromium-os/build/builder-overview#TOC-Continuous",
"hw_tests_override": [],
"luci_builder": "Informational",
+ "manifest_branch": "main",
"schedule": "0 */3 * * *",
"uprev": false,
"useflags": [
@@ -1064,6 +1067,7 @@
"doc": "https://dev.chromium.org/chromium-os/build/builder-overview#TOC-Continuous",
"hw_tests_override": null,
"luci_builder": "Try",
+ "manifest_branch": "main",
"useflags": [
"-chrome_internal"
]
@@ -1405,6 +1409,7 @@
"doc": "https://dev.chromium.org/chromium-os/build/builder-overview#TOC-Continuous",
"hw_tests_override": [],
"luci_builder": "Informational",
+ "manifest_branch": "main",
"schedule": "0 */3 * * *",
"uprev": false,
"vm_tests": []
@@ -1451,6 +1456,7 @@
"doc": "https://dev.chromium.org/chromium-os/build/builder-overview#TOC-Continuous",
"hw_tests_override": null,
"luci_builder": "Try",
+ "manifest_branch": "main",
"vm_tests": []
},
"amd64-generic-unittest-stress": {
@@ -3917,6 +3923,7 @@
"hw_tests_override": [],
"internal": true,
"luci_builder": "Informational",
+ "manifest_branch": "main",
"manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
"overlays": "both",
"uprev": false,
@@ -3936,6 +3943,7 @@
"hw_tests_override": null,
"internal": true,
"luci_builder": "Try",
+ "manifest_branch": "main",
"manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
"overlays": "both",
"vm_tests": []
@@ -7804,6 +7812,7 @@
"factory_install"
],
"luci_builder": "Full",
+ "manifest_branch": "main",
"prebuilts": "public",
"schedule": "with 30m interval",
"use_sdk": false,
@@ -7897,6 +7906,7 @@
"factory_install"
],
"luci_builder": "Try",
+ "manifest_branch": "main",
"prebuilts": "public",
"use_sdk": false,
"usepkg_build_packages": false,
