Revert "chromiumos-sdk & informational config: switch to main branch"
This reverts commit 2f14a5e90628e6e504c63b934c35f2e83959fcb5.
Suspect that hardcoded main is causing the uprev issues.
BUG=chromium:1168324
TEST=Will test on production tryjob
Change-Id: I5fe3010f5e4e51e912a35909e48a748a7befc7ee
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2685460
Reviewed-by: Manoj Gupta <manojgupta@chromium.org>
Tested-by: Manoj Gupta <manojgupta@chromium.org>
(cherry picked from commit cdde078628fe4cd58f8c5991b22687e2e91103e8)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2690915
Reviewed-by: Bob Haarman <inglorion@chromium.org>
Commit-Queue: Bob Haarman <inglorion@chromium.org>
Tested-by: Bob Haarman <inglorion@chromium.org>
diff --git a/config/chromeos_config.py b/config/chromeos_config.py
index ace6545..6a789f5 100644
--- a/config/chromeos_config.py
+++ b/config/chromeos_config.py
@@ -197,7 +197,6 @@
'informational',
display_label=config_lib.DISPLAY_LABEL_INFORMATIONAL,
description='Informational Builds',
- manifest_branch='main',
luci_builder=config_lib.LUCI_BUILDER_INFORMATIONAL,
)
@@ -2776,11 +2775,6 @@
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 c7cf599..e9abc8c 100644
--- a/config/config_dump.json
+++ b/config/config_dump.json
@@ -347,7 +347,6 @@
"image_test": true,
"images": [],
"luci_builder": "Informational",
- "manifest_branch": "main",
"packages": [
"virtual/target-fuzzers"
],
@@ -378,8 +377,7 @@
"_template": "informational",
"description": "Informational Builds",
"display_label": "informational",
- "luci_builder": "Informational",
- "manifest_branch": "main"
+ "luci_builder": "Informational"
},
"llvm_next_toolchain": {
"_template": "llvm_next_toolchain",
@@ -1050,7 +1048,6 @@
"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": [
@@ -1070,7 +1067,6 @@
"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"
]
@@ -1412,7 +1408,6 @@
"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": []
@@ -1459,7 +1454,6 @@
"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": {
@@ -3926,7 +3920,6 @@
"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,
@@ -3946,7 +3939,6 @@
"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": []
@@ -7949,7 +7941,6 @@
"factory_install"
],
"luci_builder": "Full",
- "manifest_branch": "main",
"prebuilts": "public",
"schedule": "with 30m interval",
"use_sdk": false,
@@ -8043,7 +8034,6 @@
"factory_install"
],
"luci_builder": "Try",
- "manifest_branch": "main",
"prebuilts": "public",
"use_sdk": false,
"usepkg_build_packages": false,
