commit d8d70f0f72836e185f2b0de8e82e94e822ec7fec
author Eric Boren <borenet@google.com> Thu Oct 31 14:43:28 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Nov 01 10:23:16 2019 +0000
tree 74bb23e985afd2f5e7cbcb88637612fe31a1546e
parent 94c09c181110320ed849296b66c929844c7b3465

[autoroll] Update regex for ChromeOS AFDO/orderfile rollers

Change-Id: If93367473f56996d4eca24e6a0ea6844eddef09e
Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/252040
Reviewed-by: Tiancong Wang <tcwang@google.com>
Commit-Queue: Eric Boren <borenet@google.com>

autoroll/config/cros-afdo-airmont-chromium.json

diff --git a/autoroll/config/cros-afdo-airmont-chromium.json b/autoroll/config/cros-afdo-airmont-chromium.json
index 0e8d03d..ea9fea2 100644
--- a/autoroll/config/cros-afdo-airmont-chromium.json
+++ b/autoroll/config/cros-afdo-airmont-chromium.json
@@ -42,9 +42,9 @@
     "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+)",
+    "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-(\\d+).(\\d+).(\\d+).(\\d+)-r(\\d+)-redacted.afdo.xz$"
+    "versionRegex": "^chromeos-chrome-amd64-airmont-(\\d+)-\\d+.\\d+-(\\d+)-benchmark-(\\d+).(\\d+).(\\d+).(\\d+)-r(\\d+)-redacted.afdo.xz$"
   },
   "kubernetes": {
     "cpu": "1",

autoroll/config/cros-afdo-broadwell-chromium.json

diff --git a/autoroll/config/cros-afdo-broadwell-chromium.json b/autoroll/config/cros-afdo-broadwell-chromium.json
index 19f35f3..a65a03d 100644
--- a/autoroll/config/cros-afdo-broadwell-chromium.json
+++ b/autoroll/config/cros-afdo-broadwell-chromium.json
@@ -42,9 +42,9 @@
     "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+)",
+    "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-(\\d+).(\\d+).(\\d+).(\\d+)-r(\\d+)-redacted.afdo.xz$"
+    "versionRegex": "^chromeos-chrome-amd64-broadwell-(\\d+)-\\d+.\\d+-(\\d+)-benchmark-(\\d+).(\\d+).(\\d+).(\\d+)-r(\\d+)-redacted.afdo.xz$"
   },
   "kubernetes": {
     "cpu": "1",

autoroll/config/cros-afdo-silvermont-chromium.json

diff --git a/autoroll/config/cros-afdo-silvermont-chromium.json b/autoroll/config/cros-afdo-silvermont-chromium.json
index ea848f8..12fb1fa 100644
--- a/autoroll/config/cros-afdo-silvermont-chromium.json
+++ b/autoroll/config/cros-afdo-silvermont-chromium.json
@@ -42,9 +42,9 @@
     "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+)",
+    "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-(\\d+).(\\d+).(\\d+).(\\d+)-r(\\d+)-redacted.afdo.xz$"
+    "versionRegex": "^chromeos-chrome-amd64-silvermont-(\\d+)-\\d+.\\d+-(\\d+)-benchmark-(\\d+).(\\d+).(\\d+).(\\d+)-r(\\d+)-redacted.afdo.xz$"
   },
   "kubernetes": {
     "cpu": "1",

autoroll/config/cros-orderfile-chromium.json

diff --git a/autoroll/config/cros-orderfile-chromium.json b/autoroll/config/cros-orderfile-chromium.json
index 83aea11..82ea22c 100644
--- a/autoroll/config/cros-orderfile-chromium.json
+++ b/autoroll/config/cros-orderfile-chromium.json
@@ -42,9 +42,9 @@
     "gcsPath": "afdo-job/orderfiles/vetted",
     "parentBranch": "master",
     "parentRepo": "https://chromium.googlesource.com/chromium/src.git",
-    "shortRevRegex": "(\\d+)-(\\d+).(\\d+)-(\\d+)-benchmark-(\\d+).(\\d+).(\\d+).(\\d+)-r(\\d+)",
+    "shortRevRegex": "(\\d+)-\\d+.\\d+-(\\d+)-benchmark-(\\d+).(\\d+).(\\d+).(\\d+)-r(\\d+)",
     "versionFile": "chromeos/profiles/orderfile.newest.txt",
-    "versionRegex": "^chromeos-chrome-orderfile-field-(\\d+)-(\\d+).(\\d+)-(\\d+)-benchmark-(\\d+).(\\d+).(\\d+).(\\d+)-r(\\d+).orderfile.xz$"
+    "versionRegex": "^chromeos-chrome-orderfile-field-(\\d+)-\\d+.\\d+-(\\d+)-benchmark-(\\d+).(\\d+).(\\d+).(\\d+)-r(\\d+).orderfile.xz$"
   },
   "kubernetes": {
     "cpu": "1",