[autoroll] Roll back Bot-Commit for some rollers
Change-Id: Iace837c41b387ba9de7da78b6c942d70cc0a92ab
Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/371277
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
diff --git a/autoroll/config/binaryen-emscripten-releases.cfg b/autoroll/config/binaryen-emscripten-releases.cfg
index af028e9..d4a4c40 100644
--- a/autoroll/config/binaryen-emscripten-releases.cfg
+++ b/autoroll/config/binaryen-emscripten-releases.cfg
@@ -21,7 +21,7 @@
gerrit: {
url: "https://chromium-review.googlesource.com"
project: "emscripten-releases"
- config: CHROMIUM_BOT_COMMIT
+ config: CHROMIUM
}
kubernetes: {
cpu: "1"
@@ -45,7 +45,7 @@
gerrit: {
url: "https://chromium-review.googlesource.com"
project: "emscripten-releases"
- config: CHROMIUM_BOT_COMMIT
+ config: CHROMIUM
}
}
gitiles_child: {
diff --git a/autoroll/config/chromiumos-config-infra.cfg b/autoroll/config/chromiumos-config-infra.cfg
index 9a9710a..da041d2 100644
--- a/autoroll/config/chromiumos-config-infra.cfg
+++ b/autoroll/config/chromiumos-config-infra.cfg
@@ -24,7 +24,7 @@
gerrit: {
url: "https://chromium-review.googlesource.com"
project: "infra/infra"
- config: CHROMIUM_BOT_COMMIT
+ config: CHROMIUM
}
kubernetes: {
cpu: "1"
@@ -48,7 +48,7 @@
gerrit: {
url: "https://chromium-review.googlesource.com"
project: "infra/infra"
- config: CHROMIUM_BOT_COMMIT
+ config: CHROMIUM
}
}
gitiles_child: {
diff --git a/autoroll/config/cros-proto-infra.cfg b/autoroll/config/cros-proto-infra.cfg
index 6b9e00b..78684dc 100644
--- a/autoroll/config/cros-proto-infra.cfg
+++ b/autoroll/config/cros-proto-infra.cfg
@@ -22,7 +22,7 @@
gerrit: {
url: "https://chromium-review.googlesource.com"
project: "infra/infra"
- config: CHROMIUM_BOT_COMMIT
+ config: CHROMIUM
}
kubernetes: {
cpu: "1"
@@ -46,7 +46,7 @@
gerrit: {
url: "https://chromium-review.googlesource.com"
project: "infra/infra"
- config: CHROMIUM_BOT_COMMIT
+ config: CHROMIUM
}
}
gitiles_child: {
diff --git a/autoroll/config/emscripten-emscripten-releases.cfg b/autoroll/config/emscripten-emscripten-releases.cfg
index 63ce158..ddc5afe 100644
--- a/autoroll/config/emscripten-emscripten-releases.cfg
+++ b/autoroll/config/emscripten-emscripten-releases.cfg
@@ -21,7 +21,7 @@
gerrit: {
url: "https://chromium-review.googlesource.com"
project: "emscripten-releases"
- config: CHROMIUM_BOT_COMMIT
+ config: CHROMIUM
}
kubernetes: {
cpu: "1"
@@ -45,7 +45,7 @@
gerrit: {
url: "https://chromium-review.googlesource.com"
project: "emscripten-releases"
- config: CHROMIUM_BOT_COMMIT
+ config: CHROMIUM
}
}
gitiles_child: {
diff --git a/autoroll/config/llvm-project-emscripten-releases.cfg b/autoroll/config/llvm-project-emscripten-releases.cfg
index e3b1a57..9f891e0 100644
--- a/autoroll/config/llvm-project-emscripten-releases.cfg
+++ b/autoroll/config/llvm-project-emscripten-releases.cfg
@@ -22,7 +22,7 @@
gerrit: {
url: "https://chromium-review.googlesource.com"
project: "emscripten-releases"
- config: CHROMIUM_BOT_COMMIT
+ config: CHROMIUM
}
kubernetes: {
cpu: "1"
@@ -46,7 +46,7 @@
gerrit: {
url: "https://chromium-review.googlesource.com"
project: "emscripten-releases"
- config: CHROMIUM_BOT_COMMIT
+ config: CHROMIUM
}
}
gitiles_child: {
diff --git a/autoroll/config/luci-go-infra.cfg b/autoroll/config/luci-go-infra.cfg
index 99e2ebc..ad922d9 100644
--- a/autoroll/config/luci-go-infra.cfg
+++ b/autoroll/config/luci-go-infra.cfg
@@ -21,7 +21,7 @@
gerrit: {
url: "https://chromium-review.googlesource.com"
project: "infra/infra"
- config: CHROMIUM_BOT_COMMIT
+ config: CHROMIUM
}
kubernetes: {
cpu: "1"
@@ -45,7 +45,7 @@
gerrit: {
url: "https://chromium-review.googlesource.com"
project: "infra/infra"
- config: CHROMIUM_BOT_COMMIT
+ config: CHROMIUM
}
}
gitiles_child: {
diff --git a/autoroll/config/luci-py-infra.cfg b/autoroll/config/luci-py-infra.cfg
index 70e5f84..f4f79ba 100644
--- a/autoroll/config/luci-py-infra.cfg
+++ b/autoroll/config/luci-py-infra.cfg
@@ -21,7 +21,7 @@
gerrit: {
url: "https://chromium-review.googlesource.com"
project: "infra/infra"
- config: CHROMIUM_BOT_COMMIT
+ config: CHROMIUM
}
kubernetes: {
cpu: "1"
@@ -45,7 +45,7 @@
gerrit: {
url: "https://chromium-review.googlesource.com"
project: "infra/infra"
- config: CHROMIUM_BOT_COMMIT
+ config: CHROMIUM
}
}
gitiles_child: {
diff --git a/autoroll/config/waterfall-emscripten-releases.cfg b/autoroll/config/waterfall-emscripten-releases.cfg
index 4543255..248abe3 100644
--- a/autoroll/config/waterfall-emscripten-releases.cfg
+++ b/autoroll/config/waterfall-emscripten-releases.cfg
@@ -20,7 +20,7 @@
gerrit: {
url: "https://chromium-review.googlesource.com"
project: "emscripten-releases"
- config: CHROMIUM_BOT_COMMIT
+ config: CHROMIUM
}
kubernetes: {
cpu: "1"
@@ -44,7 +44,7 @@
gerrit: {
url: "https://chromium-review.googlesource.com"
project: "emscripten-releases"
- config: CHROMIUM_BOT_COMMIT
+ config: CHROMIUM
}
}
gitiles_child: {
diff --git a/infra/bots/task_drivers/validate_autoroll_configs/validate_autoroll_configs.go b/infra/bots/task_drivers/validate_autoroll_configs/validate_autoroll_configs.go
index 88bdf20..38c60ce 100644
--- a/infra/bots/task_drivers/validate_autoroll_configs/validate_autoroll_configs.go
+++ b/infra/bots/task_drivers/validate_autoroll_configs/validate_autoroll_configs.go
@@ -68,7 +68,9 @@
if util.In(cfg.ServiceAccount, chromiumServiceAccounts) {
gerrit := cfg.GetGerrit()
if gerrit != nil && gerrit.Config == config.GerritConfig_CHROMIUM {
- return skerr.Fmt("Chromium rollers must use Gerrit config CHROMIUM_BOT_COMMIT")
+ if gerrit.Project != "emscripten-releases" && gerrit.Project != "infra/infra" {
+ return skerr.Fmt("Chromium rollers must use Gerrit config CHROMIUM_BOT_COMMIT")
+ }
}
}
