Revert "[autoroll] Switch ANGLE rollers to Bot-Commit label"
This reverts commit 1550b3c5fc4a3bbfe4dee6b87d2ca31d5796851a.
Reason for revert: service account doesn't have permission for Bot-Commit
Original change's description:
> [autoroll] Switch ANGLE rollers to Bot-Commit label
>
> Bug: skia:11338
> Change-Id: I9b8fa1ad0234e222e09a0c8a6feae8bb96fa2070
> Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/375068
> Reviewed-by: Ravi Mistry <rmistry@google.com>
> Commit-Queue: Eric Boren <borenet@google.com>
TBR=borenet@google.com,rmistry@google.com
Change-Id: Iac3a071eee3c340b334dfe88742f2c6896612bb0
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:11338
Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/375716
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
diff --git a/autoroll/config/chromium-angle.cfg b/autoroll/config/chromium-angle.cfg
index 175a65e..a05ce61 100644
--- a/autoroll/config/chromium-angle.cfg
+++ b/autoroll/config/chromium-angle.cfg
@@ -27,7 +27,7 @@
gerrit: {
url: "https://chromium-review.googlesource.com"
project: "angle/angle"
- config: CHROMIUM_BOT_COMMIT
+ config: ANGLE
}
kubernetes: {
cpu: "2"
@@ -58,7 +58,7 @@
gerrit: {
url: "https://chromium-review.googlesource.com"
project: "angle/angle"
- config: CHROMIUM_BOT_COMMIT
+ config: ANGLE
}
}
gitiles_child: {
diff --git a/autoroll/config/swiftshader-angle.cfg b/autoroll/config/swiftshader-angle.cfg
index 0d559c5..c764466 100644
--- a/autoroll/config/swiftshader-angle.cfg
+++ b/autoroll/config/swiftshader-angle.cfg
@@ -28,7 +28,7 @@
gerrit: {
url: "https://chromium-review.googlesource.com"
project: "angle/angle"
- config: CHROMIUM_BOT_COMMIT
+ config: ANGLE
}
kubernetes: {
cpu: "1"
@@ -52,7 +52,7 @@
gerrit: {
url: "https://chromium-review.googlesource.com"
project: "angle/angle"
- config: CHROMIUM_BOT_COMMIT
+ config: ANGLE
}
}
gitiles_child: {
diff --git a/autoroll/config/vk-gl-cts-angle.cfg b/autoroll/config/vk-gl-cts-angle.cfg
index 9b909ef..bf61045 100644
--- a/autoroll/config/vk-gl-cts-angle.cfg
+++ b/autoroll/config/vk-gl-cts-angle.cfg
@@ -24,7 +24,7 @@
gerrit: {
url: "https://chromium-review.googlesource.com"
project: "angle/angle"
- config: CHROMIUM_BOT_COMMIT
+ config: ANGLE
}
kubernetes: {
cpu: "2"
@@ -57,7 +57,7 @@
gerrit: {
url: "https://chromium-review.googlesource.com"
project: "angle/angle"
- config: CHROMIUM_BOT_COMMIT
+ config: ANGLE
}
}
git_checkout_child: {
diff --git a/autoroll/config/vulkan-deps-angle.cfg b/autoroll/config/vulkan-deps-angle.cfg
index e5bae1a..f332a8c 100644
--- a/autoroll/config/vulkan-deps-angle.cfg
+++ b/autoroll/config/vulkan-deps-angle.cfg
@@ -24,7 +24,7 @@
gerrit: {
url: "https://chromium-review.googlesource.com"
project: "angle/angle"
- config: CHROMIUM_BOT_COMMIT
+ config: ANGLE
}
kubernetes: {
cpu: "2"
@@ -58,7 +58,7 @@
gerrit: {
url: "https://chromium-review.googlesource.com"
project: "angle/angle"
- config: CHROMIUM_BOT_COMMIT
+ config: ANGLE
}
}
git_checkout_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 fe5b6c3..5731895 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
@@ -36,9 +36,10 @@
var (
// "constants"
- chromiumGerritHosts = []string{
- "https://chromium-review.googlesource.com",
- "https://chrome-internal-review.googlesource.com",
+ chromiumServiceAccounts = []string{
+ "chromium-autoroll@skia-public.iam.gserviceaccount.com",
+ "chromium-release-autoroll@skia-public.iam.gserviceaccount.com",
+ "chromium-internal-autoroll@skia-corp.google.com.iam.gserviceaccount.com",
}
)
@@ -64,10 +65,11 @@
if err := cfg.Validate(); err != nil {
return skerr.Wrap(err)
}
-
- gerrit := cfg.GetGerrit()
- if gerrit != nil && util.In(gerrit.Url, chromiumGerritHosts) && (gerrit.Config != config.GerritConfig_CHROMIUM_BOT_COMMIT && gerrit.Config != config.GerritConfig_CHROMIUM_BOT_COMMIT_NO_CQ) {
- return skerr.Fmt("Chromium rollers must use Gerrit config CHROMIUM_BOT_COMMIT")
+ if util.In(cfg.ServiceAccount, chromiumServiceAccounts) {
+ gerrit := cfg.GetGerrit()
+ if gerrit != nil && gerrit.Config == config.GerritConfig_CHROMIUM || gerrit.Config == config.GerritConfig_CHROMIUM_NO_CQ {
+ return skerr.Fmt("Chromium rollers must use Gerrit config CHROMIUM_BOT_COMMIT")
+ }
}
rollerName = cfg.RollerName
