Revert "[autoroll] Roll back Bot-Commit for some rollers"
This reverts commit 0437d117d19d653fc87cebfa5f747ae7030fba54.
Reason for revert: I'm told that these projects should be fixed now.
Original change's description:
> [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>
# Not skipping CQ checks because original CL landed > 1 day ago.
Change-Id: Ia8d6ee53f8f36bd1e2301de1ce7fbfc170d4526d
Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/374976
Reviewed-by: Eric Boren <borenet@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 d4a4c40..af028e9 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
+ config: CHROMIUM_BOT_COMMIT
}
kubernetes: {
cpu: "1"
@@ -45,7 +45,7 @@
gerrit: {
url: "https://chromium-review.googlesource.com"
project: "emscripten-releases"
- config: CHROMIUM
+ config: CHROMIUM_BOT_COMMIT
}
}
gitiles_child: {
diff --git a/autoroll/config/chromiumos-config-infra.cfg b/autoroll/config/chromiumos-config-infra.cfg
index da041d2..9a9710a 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
+ config: CHROMIUM_BOT_COMMIT
}
kubernetes: {
cpu: "1"
@@ -48,7 +48,7 @@
gerrit: {
url: "https://chromium-review.googlesource.com"
project: "infra/infra"
- config: CHROMIUM
+ config: CHROMIUM_BOT_COMMIT
}
}
gitiles_child: {
diff --git a/autoroll/config/cros-proto-infra.cfg b/autoroll/config/cros-proto-infra.cfg
index 78684dc..6b9e00b 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
+ config: CHROMIUM_BOT_COMMIT
}
kubernetes: {
cpu: "1"
@@ -46,7 +46,7 @@
gerrit: {
url: "https://chromium-review.googlesource.com"
project: "infra/infra"
- config: CHROMIUM
+ config: CHROMIUM_BOT_COMMIT
}
}
gitiles_child: {
diff --git a/autoroll/config/emscripten-emscripten-releases.cfg b/autoroll/config/emscripten-emscripten-releases.cfg
index ddc5afe..63ce158 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
+ config: CHROMIUM_BOT_COMMIT
}
kubernetes: {
cpu: "1"
@@ -45,7 +45,7 @@
gerrit: {
url: "https://chromium-review.googlesource.com"
project: "emscripten-releases"
- config: CHROMIUM
+ config: CHROMIUM_BOT_COMMIT
}
}
gitiles_child: {
diff --git a/autoroll/config/llvm-project-emscripten-releases.cfg b/autoroll/config/llvm-project-emscripten-releases.cfg
index 9f891e0..e3b1a57 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
+ config: CHROMIUM_BOT_COMMIT
}
kubernetes: {
cpu: "1"
@@ -46,7 +46,7 @@
gerrit: {
url: "https://chromium-review.googlesource.com"
project: "emscripten-releases"
- config: CHROMIUM
+ config: CHROMIUM_BOT_COMMIT
}
}
gitiles_child: {
diff --git a/autoroll/config/luci-go-infra.cfg b/autoroll/config/luci-go-infra.cfg
index ad922d9..99e2ebc 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
+ config: CHROMIUM_BOT_COMMIT
}
kubernetes: {
cpu: "1"
@@ -45,7 +45,7 @@
gerrit: {
url: "https://chromium-review.googlesource.com"
project: "infra/infra"
- config: CHROMIUM
+ config: CHROMIUM_BOT_COMMIT
}
}
gitiles_child: {
diff --git a/autoroll/config/luci-py-infra.cfg b/autoroll/config/luci-py-infra.cfg
index f4f79ba..70e5f84 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
+ config: CHROMIUM_BOT_COMMIT
}
kubernetes: {
cpu: "1"
@@ -45,7 +45,7 @@
gerrit: {
url: "https://chromium-review.googlesource.com"
project: "infra/infra"
- config: CHROMIUM
+ config: CHROMIUM_BOT_COMMIT
}
}
gitiles_child: {
diff --git a/autoroll/config/waterfall-emscripten-releases.cfg b/autoroll/config/waterfall-emscripten-releases.cfg
index 248abe3..4543255 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
+ config: CHROMIUM_BOT_COMMIT
}
kubernetes: {
cpu: "1"
@@ -44,7 +44,7 @@
gerrit: {
url: "https://chromium-review.googlesource.com"
project: "emscripten-releases"
- config: CHROMIUM
+ config: CHROMIUM_BOT_COMMIT
}
}
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 38c60ce..88bdf20 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,9 +68,7 @@
if util.In(cfg.ServiceAccount, chromiumServiceAccounts) {
gerrit := cfg.GetGerrit()
if gerrit != nil && gerrit.Config == config.GerritConfig_CHROMIUM {
- if gerrit.Project != "emscripten-releases" && gerrit.Project != "infra/infra" {
- return skerr.Fmt("Chromium rollers must use Gerrit config CHROMIUM_BOT_COMMIT")
- }
+ return skerr.Fmt("Chromium rollers must use Gerrit config CHROMIUM_BOT_COMMIT")
}
}