infra: Support both master and main branches Prepare boringssl infra for master->main migration Change-Id: I331ff76284091278edfc17946728ac3fbaf040bf Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/75327 Reviewed-by: David Benjamin <davidben@google.com> Commit-Queue: David Benjamin <davidben@google.com>
diff --git a/infra/config/generated/luci-milo.cfg b/infra/config/generated/luci-milo.cfg index e91d83e..7b21e54 100644 --- a/infra/config/generated/luci-milo.cfg +++ b/infra/config/generated/luci-milo.cfg
@@ -9,6 +9,7 @@ name: "BoringSSL Main Console" repo_url: "https://boringssl.googlesource.com/boringssl" refs: "regexp:refs/heads/master" + refs: "regexp:refs/heads/main" manifest_name: "REVISION" builders { name: "buildbucket/luci.boringssl.ci/android_aarch64"
diff --git a/infra/config/generated/luci-scheduler.cfg b/infra/config/generated/luci-scheduler.cfg index 75bc2be..057baa6 100644 --- a/infra/config/generated/luci-scheduler.cfg +++ b/infra/config/generated/luci-scheduler.cfg
@@ -535,7 +535,7 @@ } } trigger { - id: "master-gitiles-trigger" + id: "main-gitiles-trigger" realm: "ci" acl_sets: "ci" triggers: "android_aarch64" @@ -594,6 +594,7 @@ gitiles { repo: "https://boringssl.googlesource.com/boringssl" refs: "regexp:refs/heads/master" + refs: "regexp:refs/heads/main" } } acl_sets {
diff --git a/infra/config/generated/project.cfg b/infra/config/generated/project.cfg index e2ae129..07a04a0 100644 --- a/infra/config/generated/project.cfg +++ b/infra/config/generated/project.cfg
@@ -7,7 +7,7 @@ name: "boringssl" access: "group:all" lucicfg { - version: "1.43.14" + version: "1.43.16" package_dir: ".." config_dir: "generated" entry_point: "main.star"
diff --git a/infra/config/main.star b/infra/config/main.star index f875c10..677799d 100755 --- a/infra/config/main.star +++ b/infra/config/main.star
@@ -78,7 +78,7 @@ console_view = luci.console_view( name = "main", repo = REPO_URL, - refs = ["refs/heads/master"], + refs = ["refs/heads/master", "refs/heads/main"], title = "BoringSSL Main Console", ) @@ -98,10 +98,10 @@ ) poller = luci.gitiles_poller( - name = "master-gitiles-trigger", + name = "main-gitiles-trigger", bucket = "ci", repo = REPO_URL, - refs = ["refs/heads/master"], + refs = ["refs/heads/master", "refs/heads/main"], ) luci.logdog(