Revert "[autoroll] Manually update cros roller branches"
This reverts commit 23ee4e5b79cc87d4a453b907bd11793265223da2.
Reason for revert: beta and master rollers crash-looping because no matching revisions are found
Original change's description:
> [autoroll] Manually update cros roller branches
>
> Change the branch due to M84 is branched to beta. I have a script
> to generate these changes now, so hopefully it can reduce human errors.
> Also, my script has made sure the profiles exist before making the
> changes, so hopefully it won't trigger alerts on Skia side.
>
> Change-Id: I1dc692f26b877ed87f79fd57fdf896cf10128021
> Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/291466
> Auto-Submit: Tiancong Wang <tcwang@google.com>
> Commit-Queue: Eric Boren <borenet@google.com>
> Reviewed-by: Eric Boren <borenet@google.com>
TBR=borenet@google.com,tcwang@google.com
Change-Id: I7646a6641b07dfa8790f88b53921ad1367d05779
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/291856
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
diff --git a/autoroll/config/cros-afdo-airmont-chromium-beta.json b/autoroll/config/cros-afdo-airmont-chromium-beta.json
index b07422c..30df1aa 100644
--- a/autoroll/config/cros-afdo-airmont-chromium-beta.json
+++ b/autoroll/config/cros-afdo-airmont-chromium-beta.json
@@ -29,11 +29,11 @@
"childPath": "chromeos/profiles/airmont.afdo.newest.txt",
"gcsBucket": "chromeos-prebuilt",
"gcsPath": "afdo-job/vetted/release",
- "parentBranch": "refs/branch-heads/4147", // m84
+ "parentBranch": "refs/branch-heads/4103", // m83
"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-84-\\d+.\\d+-(\\d+)-benchmark-84.(\\d+).4147.(\\d+)-r(\\d+)-redacted.afdo.xz$"
+ "versionRegex": "^chromeos-chrome-amd64-airmont-83-\\d+.\\d+-(\\d+)-benchmark-83.(\\d+).4103.(\\d+)-r(\\d+)-redacted.afdo.xz$"
},
"kubernetes": {
"cpu": "1",
diff --git a/autoroll/config/cros-afdo-airmont-chromium-stable.json b/autoroll/config/cros-afdo-airmont-chromium-stable.json
index d1c6c48..376487a 100644
--- a/autoroll/config/cros-afdo-airmont-chromium-stable.json
+++ b/autoroll/config/cros-afdo-airmont-chromium-stable.json
@@ -29,11 +29,11 @@
"childPath": "chromeos/profiles/airmont.afdo.newest.txt",
"gcsBucket": "chromeos-prebuilt",
"gcsPath": "afdo-job/vetted/release",
- "parentBranch": "refs/branch-heads/4103", // m83
+ "parentBranch": "refs/branch-heads/4044", // m81
"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-83-4103.\\d+-(\\d+)-benchmark-83.(\\d+).4103.(\\d+)-r(\\d+)-redacted.afdo.xz$"
+ "versionRegex": "^chromeos-chrome-amd64-airmont-81-4044.\\d+-(\\d+)-benchmark-81.(\\d+).4044.(\\d+)-r(\\d+)-redacted.afdo.xz$"
},
"kubernetes": {
"cpu": "1",
diff --git a/autoroll/config/cros-afdo-airmont-chromium.json b/autoroll/config/cros-afdo-airmont-chromium.json
index 084bf1e..5216113 100644
--- a/autoroll/config/cros-afdo-airmont-chromium.json
+++ b/autoroll/config/cros-afdo-airmont-chromium.json
@@ -32,7 +32,7 @@
"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-85.(\\d+).(\\d+).(\\d+)-r(\\d+)-redacted.afdo.xz$"
+ "versionRegex": "^chromeos-chrome-amd64-airmont-(\\d+)-\\d+.\\d+-(\\d+)-benchmark-84.(\\d+).(\\d+).(\\d+)-r(\\d+)-redacted.afdo.xz$"
},
"kubernetes": {
"cpu": "1",
diff --git a/autoroll/config/cros-afdo-broadwell-chromium-beta.json b/autoroll/config/cros-afdo-broadwell-chromium-beta.json
index c4006ef..67f6f76 100644
--- a/autoroll/config/cros-afdo-broadwell-chromium-beta.json
+++ b/autoroll/config/cros-afdo-broadwell-chromium-beta.json
@@ -29,11 +29,11 @@
"childPath": "chromeos/profiles/broadwell.afdo.newest.txt",
"gcsBucket": "chromeos-prebuilt",
"gcsPath": "afdo-job/vetted/release",
- "parentBranch": "refs/branch-heads/4147", // m84
+ "parentBranch": "refs/branch-heads/4103", // m83
"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-84-\\d+.\\d+-(\\d+)-benchmark-84.(\\d+).4147.(\\d+)-r(\\d+)-redacted.afdo.xz$"
+ "versionRegex": "^chromeos-chrome-amd64-broadwell-83-\\d+.\\d+-(\\d+)-benchmark-83.(\\d+).4103.(\\d+)-r(\\d+)-redacted.afdo.xz$"
},
"kubernetes": {
"cpu": "1",
diff --git a/autoroll/config/cros-afdo-broadwell-chromium-stable.json b/autoroll/config/cros-afdo-broadwell-chromium-stable.json
index b7d6842..7eb16d7 100644
--- a/autoroll/config/cros-afdo-broadwell-chromium-stable.json
+++ b/autoroll/config/cros-afdo-broadwell-chromium-stable.json
@@ -29,11 +29,11 @@
"childPath": "chromeos/profiles/broadwell.afdo.newest.txt",
"gcsBucket": "chromeos-prebuilt",
"gcsPath": "afdo-job/vetted/release",
- "parentBranch": "refs/branch-heads/4103", // m83
+ "parentBranch": "{{.Branches.Chromium.Stable.Ref}}",
"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-83-4044.\\d+-(\\d+)-benchmark-83.(\\d+).4044.(\\d+)-r(\\d+)-redacted.afdo.xz$"
+ "versionRegex": "^chromeos-chrome-amd64-broadwell-81-4044.\\d+-(\\d+)-benchmark-81.(\\d+).4044.(\\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
index db3ff66..4fb2ebf 100644
--- a/autoroll/config/cros-afdo-broadwell-chromium.json
+++ b/autoroll/config/cros-afdo-broadwell-chromium.json
@@ -32,7 +32,7 @@
"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-85.(\\d+).(\\d+).(\\d+)-r(\\d+)-redacted.afdo.xz$"
+ "versionRegex": "^chromeos-chrome-amd64-broadwell-(\\d+)-\\d+.\\d+-(\\d+)-benchmark-84.(\\d+).(\\d+).(\\d+)-r(\\d+)-redacted.afdo.xz$"
},
"kubernetes": {
"cpu": "1",
diff --git a/autoroll/config/cros-afdo-silvermont-chromium-beta.json b/autoroll/config/cros-afdo-silvermont-chromium-beta.json
index 4a9e7fc..6814f5a 100644
--- a/autoroll/config/cros-afdo-silvermont-chromium-beta.json
+++ b/autoroll/config/cros-afdo-silvermont-chromium-beta.json
@@ -29,11 +29,11 @@
"childPath": "chromeos/profiles/silvermont.afdo.newest.txt",
"gcsBucket": "chromeos-prebuilt",
"gcsPath": "afdo-job/vetted/release",
- "parentBranch": "refs/branch-heads/4147", // m84
+ "parentBranch": "refs/branch-heads/4103", // m83
"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-84-\\d+.\\d+-(\\d+)-benchmark-84.(\\d+).4147.(\\d+)-r(\\d+)-redacted.afdo.xz$"
+ "versionRegex": "^chromeos-chrome-amd64-silvermont-83-\\d+.\\d+-(\\d+)-benchmark-83.(\\d+).4103.(\\d+)-r(\\d+)-redacted.afdo.xz$"
},
"kubernetes": {
"cpu": "1",
diff --git a/autoroll/config/cros-afdo-silvermont-chromium-stable.json b/autoroll/config/cros-afdo-silvermont-chromium-stable.json
index 6f2a8d4..4339400 100644
--- a/autoroll/config/cros-afdo-silvermont-chromium-stable.json
+++ b/autoroll/config/cros-afdo-silvermont-chromium-stable.json
@@ -29,11 +29,11 @@
"childPath": "chromeos/profiles/silvermont.afdo.newest.txt",
"gcsBucket": "chromeos-prebuilt",
"gcsPath": "afdo-job/vetted/release",
- "parentBranch": "refs/branch-heads/4103", // m83
+ "parentBranch": "refs/branch-heads/4044", // m81
"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-83-4103.\\d+-(\\d+)-benchmark-83.(\\d+).4103.(\\d+)-r(\\d+)-redacted.afdo.xz$"
+ "versionRegex": "^chromeos-chrome-amd64-silvermont-81-4044.\\d+-(\\d+)-benchmark-81.(\\d+).4044.(\\d+)-r(\\d+)-redacted.afdo.xz$"
},
"kubernetes": {
"cpu": "1",
diff --git a/autoroll/config/cros-afdo-silvermont-chromium.json b/autoroll/config/cros-afdo-silvermont-chromium.json
index bac0817..b133df9 100644
--- a/autoroll/config/cros-afdo-silvermont-chromium.json
+++ b/autoroll/config/cros-afdo-silvermont-chromium.json
@@ -32,7 +32,7 @@
"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-85.(\\d+).(\\d+).(\\d+)-r(\\d+)-redacted.afdo.xz$"
+ "versionRegex": "^chromeos-chrome-amd64-silvermont-(\\d+)-\\d+.\\d+-(\\d+)-benchmark-84.(\\d+).(\\d+).(\\d+)-r(\\d+)-redacted.afdo.xz$"
},
"kubernetes": {
"cpu": "1",
