[autoroll] Rename CrOS autorollers and the profile they roll to
As detailed in crbug.com/1135245, we need to rename CrOS profiles.
As one of the last steps, we need to rename the autorollers and
the underlying profiles they roll to. The good news is that we
can reduce the number of rollers from 3 to 2. But we can only do
this for canary branch, and propagate to release branches on each
branch point.
Bug: chromium:1135245
Change-Id: I316ca7d4d506c254792997a9f4c401b8d530393e
Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/326816
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
diff --git a/autoroll/config/cros-afdo-airmont-chromium.json b/autoroll/config/cros-afdo-atom-chromium.json
similarity index 76%
copy from autoroll/config/cros-afdo-airmont-chromium.json
copy to autoroll/config/cros-afdo-atom-chromium.json
index a7cc4b9..2e2b543 100644
--- a/autoroll/config/cros-afdo-airmont-chromium.json
+++ b/autoroll/config/cros-afdo-atom-chromium.json
@@ -1,7 +1,7 @@
// See https://skia.googlesource.com/buildbot.git/+show/master/autoroll/go/roller/config.go#130
// for documentation of the autoroller config.
{
- "childDisplayName": "ChromeOS Airmont AFDO profile",
+ "childDisplayName": "ChromeOS Atom AFDO profile",
"commitMsg": {
"includeTbrLine": true
},
@@ -18,21 +18,21 @@
"ownerSecondary": "rmistry",
"parentDisplayName": "Chromium",
"parentWaterfall": "https://build.chromium.org",
- "rollerName": "cros-afdo-airmont-chromium",
+ "rollerName": "cros-afdo-atom-chromium",
"serviceAccount": "chromium-autoroll@skia-public.google.com.iam.gserviceaccount.com",
"sheriff": [
"c-compiler-chrome@google.com"
],
"semVerGCSRepoManager": {
"childBranch": "master",
- "childPath": "chromeos/profiles/airmont.afdo.newest.txt",
+ "childPath": "chromeos/profiles/atom.afdo.newest.txt",
"gcsBucket": "chromeos-prebuilt",
"gcsPath": "afdo-job/vetted/release",
"parentBranch": "master",
"parentRepo": "https://chromium.googlesource.com/chromium/src.git",
"shortRevRegex": "\\d+-\\d+.\\d+-\\d+-benchmark-\\d+.\\d+.\\d+.\\d+-r\\d+",
- "versionFile": "chromeos/profiles/airmont.afdo.newest.txt",
- "versionRegex": "^chromeos-chrome-amd64-airmont-(\\d+)-\\d+.\\d+-(\\d+)-benchmark-88.(\\d+).(\\d+).(\\d+)-r(\\d+)-redacted.afdo.xz$"
+ "versionFile": "chromeos/profiles/atom.afdo.newest.txt",
+ "versionRegex": "^chromeos-chrome-amd64-atom-(\\d+)-\\d+.\\d+-(\\d+)-benchmark-88.(\\d+).(\\d+).(\\d+)-r(\\d+)-redacted.afdo.xz$"
},
"kubernetes": {
"cpu": "1",
diff --git a/autoroll/config/cros-afdo-airmont-chromium.json b/autoroll/config/cros-afdo-bigcore-chromium.json
similarity index 81%
rename from autoroll/config/cros-afdo-airmont-chromium.json
rename to autoroll/config/cros-afdo-bigcore-chromium.json
index a7cc4b9..9bf7652 100644
--- a/autoroll/config/cros-afdo-airmont-chromium.json
+++ b/autoroll/config/cros-afdo-bigcore-chromium.json
@@ -1,7 +1,7 @@
// See https://skia.googlesource.com/buildbot.git/+show/master/autoroll/go/roller/config.go#130
// for documentation of the autoroller config.
{
- "childDisplayName": "ChromeOS Airmont AFDO profile",
+ "childDisplayName": "ChromeOS Bigcore AFDO profile",
"commitMsg": {
"includeTbrLine": true
},
@@ -18,21 +18,21 @@
"ownerSecondary": "rmistry",
"parentDisplayName": "Chromium",
"parentWaterfall": "https://build.chromium.org",
- "rollerName": "cros-afdo-airmont-chromium",
+ "rollerName": "cros-afdo-bigcore-chromium",
"serviceAccount": "chromium-autoroll@skia-public.google.com.iam.gserviceaccount.com",
"sheriff": [
"c-compiler-chrome@google.com"
],
"semVerGCSRepoManager": {
"childBranch": "master",
- "childPath": "chromeos/profiles/airmont.afdo.newest.txt",
+ "childPath": "chromeos/profiles/bigcore.afdo.newest.txt",
"gcsBucket": "chromeos-prebuilt",
"gcsPath": "afdo-job/vetted/release",
"parentBranch": "master",
"parentRepo": "https://chromium.googlesource.com/chromium/src.git",
"shortRevRegex": "\\d+-\\d+.\\d+-\\d+-benchmark-\\d+.\\d+.\\d+.\\d+-r\\d+",
- "versionFile": "chromeos/profiles/airmont.afdo.newest.txt",
- "versionRegex": "^chromeos-chrome-amd64-airmont-(\\d+)-\\d+.\\d+-(\\d+)-benchmark-88.(\\d+).(\\d+).(\\d+)-r(\\d+)-redacted.afdo.xz$"
+ "versionFile": "chromeos/profiles/bigcore.afdo.newest.txt",
+ "versionRegex": "^chromeos-chrome-amd64-bigcore-(\\d+)-\\d+.\\d+-(\\d+)-benchmark-88.(\\d+).(\\d+).(\\d+)-r(\\d+)-redacted.afdo.xz$"
},
"kubernetes": {
"cpu": "1",
diff --git a/autoroll/config/cros-afdo-broadwell-chromium.json b/autoroll/config/cros-afdo-broadwell-chromium.json
deleted file mode 100644
index bff3add..0000000
--- a/autoroll/config/cros-afdo-broadwell-chromium.json
+++ /dev/null
@@ -1,45 +0,0 @@
-// See https://skia.googlesource.com/buildbot.git/+show/master/autoroll/go/roller/config.go#130
-// for documentation of the autoroller config.
-{
- "childDisplayName": "ChromeOS Broadwell AFDO profile",
- "commitMsg": {
- "includeTbrLine": true
- },
- "contacts": [
- "tcwang@google.com"
- ],
- "gerrit": {
- "url": "https://chromium-review.googlesource.com",
- "project": "chromium/src",
- "config": "chromium"
- },
- "isInternal": false,
- "ownerPrimary": "borenet",
- "ownerSecondary": "rmistry",
- "parentDisplayName": "Chromium",
- "parentWaterfall": "https://build.chromium.org",
- "rollerName": "cros-afdo-broadwell-chromium",
- "serviceAccount": "chromium-autoroll@skia-public.google.com.iam.gserviceaccount.com",
- "sheriff": [
- "c-compiler-chrome@google.com"
- ],
- "semVerGCSRepoManager": {
- "childBranch": "master",
- "childPath": "chromeos/profiles/broadwell.afdo.newest.txt",
- "gcsBucket": "chromeos-prebuilt",
- "gcsPath": "afdo-job/vetted/release",
- "parentBranch": "master",
- "parentRepo": "https://chromium.googlesource.com/chromium/src.git",
- "shortRevRegex": "\\d+-\\d+.\\d+-\\d+-benchmark-\\d+.\\d+.\\d+.\\d+-r\\d+",
- "versionFile": "chromeos/profiles/broadwell.afdo.newest.txt",
- "versionRegex": "^chromeos-chrome-amd64-broadwell-(\\d+)-\\d+.\\d+-(\\d+)-benchmark-88.(\\d+).(\\d+).(\\d+)-r(\\d+)-redacted.afdo.xz$"
- },
- "kubernetes": {
- "cpu": "1",
- "memory": "2Gi",
- "readinessInitialDelaySeconds": "30",
- "readinessPeriodSeconds": "30",
- "readinessFailureThreshold": "10"
- },
- "maxRollFrequency": "0m"
-}
diff --git a/autoroll/config/cros-afdo-silvermont-chromium.json b/autoroll/config/cros-afdo-silvermont-chromium.json
deleted file mode 100644
index a337ac2..0000000
--- a/autoroll/config/cros-afdo-silvermont-chromium.json
+++ /dev/null
@@ -1,45 +0,0 @@
-// See https://skia.googlesource.com/buildbot.git/+show/master/autoroll/go/roller/config.go#130
-// for documentation of the autoroller config.
-{
- "childDisplayName": "ChromeOS Silvermont AFDO profile",
- "commitMsg": {
- "includeTbrLine": true
- },
- "contacts": [
- "tcwang@google.com"
- ],
- "gerrit": {
- "url": "https://chromium-review.googlesource.com",
- "project": "chromium/src",
- "config": "chromium"
- },
- "isInternal": false,
- "ownerPrimary": "borenet",
- "ownerSecondary": "rmistry",
- "parentDisplayName": "Chromium",
- "parentWaterfall": "https://build.chromium.org",
- "rollerName": "cros-afdo-silvermont-chromium",
- "serviceAccount": "chromium-autoroll@skia-public.google.com.iam.gserviceaccount.com",
- "sheriff": [
- "c-compiler-chrome@google.com"
- ],
- "semVerGCSRepoManager": {
- "childBranch": "master",
- "childPath": "chromeos/profiles/silvermont.afdo.newest.txt",
- "gcsBucket": "chromeos-prebuilt",
- "gcsPath": "afdo-job/vetted/release",
- "parentBranch": "master",
- "parentRepo": "https://chromium.googlesource.com/chromium/src.git",
- "shortRevRegex": "\\d+-\\d+.\\d+-\\d+-benchmark-\\d+.\\d+.\\d+.\\d+-r\\d+",
- "versionFile": "chromeos/profiles/silvermont.afdo.newest.txt",
- "versionRegex": "^chromeos-chrome-amd64-silvermont-(\\d+)-\\d+.\\d+-(\\d+)-benchmark-88.(\\d+).(\\d+).(\\d+)-r(\\d+)-redacted.afdo.xz$"
- },
- "kubernetes": {
- "cpu": "1",
- "memory": "2Gi",
- "readinessInitialDelaySeconds": "30",
- "readinessPeriodSeconds": "30",
- "readinessFailureThreshold": "10"
- },
- "maxRollFrequency": "0m"
-}
