[autoroll] Update AFDO roller to match -merged profiles
ie. from:
chromeos-chrome-amd64-74.0.3702.0_rc-r1.afdo.bz2
to:
chromeos-chrome-amd64-74.0.3702.0_rc-r1-merged.afdo.bz2
Bug: skia:
Change-Id: I064ba3ea457bd6eb2850e92c5a26a5fc17d229d4
Reviewed-on: https://skia-review.googlesource.com/c/191581
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Ravi Mistry <rmistry@google.com>
diff --git a/autoroll/go/repo_manager/chromium_afdo_repo_manager_test.go b/autoroll/go/repo_manager/chromium_afdo_repo_manager_test.go
index e01b77a..82357a2 100644
--- a/autoroll/go/repo_manager/chromium_afdo_repo_manager_test.go
+++ b/autoroll/go/repo_manager/chromium_afdo_repo_manager_test.go
@@ -24,9 +24,9 @@
)
const (
- afdoRevPrev = "chromeos-chrome-amd64-66.0.3336.3_rc-r0.afdo.bz2"
- afdoRevBase = "chromeos-chrome-amd64-66.0.3336.3_rc-r1.afdo.bz2"
- afdoRevNext = "chromeos-chrome-amd64-66.0.3337.3_rc-r1.afdo.bz2"
+ afdoRevPrev = "chromeos-chrome-amd64-66.0.3336.3_rc-r0-merged.afdo.bz2"
+ afdoRevBase = "chromeos-chrome-amd64-66.0.3336.3_rc-r1-merged.afdo.bz2"
+ afdoRevNext = "chromeos-chrome-amd64-66.0.3337.3_rc-r1-merged.afdo.bz2"
afdoTimePrev = "2009-11-10T23:00:00Z"
afdoTimeBase = "2009-11-10T23:01:00Z"
diff --git a/autoroll/go/strategy/afdo.go b/autoroll/go/strategy/afdo.go
index 2a5b6a8..26463d7 100644
--- a/autoroll/go/strategy/afdo.go
+++ b/autoroll/go/strategy/afdo.go
@@ -34,7 +34,7 @@
"^chromeos-chrome-amd64-" + // Prefix
"(\\d+)\\.(\\d+)\\.(\\d+)\\.(\\d+)" + // Version
"_rc-r(\\d+)" + // Revision
- "\\.afdo\\.bz2$") // Suffix
+ "-merged\\.afdo\\.bz2$") // Suffix
// Error used to indicate that a version number is invalid.
errInvalidAFDOVersion = errors.New("Invalid AFDO version.")
diff --git a/autoroll/go/strategy/afdo_test.go b/autoroll/go/strategy/afdo_test.go
index fe5fee6..924fa81 100644
--- a/autoroll/go/strategy/afdo_test.go
+++ b/autoroll/go/strategy/afdo_test.go
@@ -9,9 +9,9 @@
)
const (
- afdoRevPrev = "chromeos-chrome-amd64-66.0.3336.3_rc-r0.afdo.bz2"
- afdoRevBase = "chromeos-chrome-amd64-66.0.3336.3_rc-r1.afdo.bz2"
- afdoRevNext = "chromeos-chrome-amd64-66.0.3337.3_rc-r1.afdo.bz2"
+ afdoRevPrev = "chromeos-chrome-amd64-66.0.3336.3_rc-r0-merged.afdo.bz2"
+ afdoRevBase = "chromeos-chrome-amd64-66.0.3336.3_rc-r1-merged.afdo.bz2"
+ afdoRevNext = "chromeos-chrome-amd64-66.0.3337.3_rc-r1-merged.afdo.bz2"
)
func TestParseAFDOVersion(t *testing.T) {
@@ -26,20 +26,20 @@
testS(afdoRevPrev, [AFDO_VERSION_LENGTH]int{66, 0, 3336, 3, 0})
testS(afdoRevBase, [AFDO_VERSION_LENGTH]int{66, 0, 3336, 3, 1})
testS(afdoRevNext, [AFDO_VERSION_LENGTH]int{66, 0, 3337, 3, 1})
- testS("chromeos-chrome-amd64-67.0.3.222222_rc-r32823.afdo.bz2", [AFDO_VERSION_LENGTH]int{67, 0, 3, 222222, 32823})
+ testS("chromeos-chrome-amd64-67.0.3.222222_rc-r32823-merged.afdo.bz2", [AFDO_VERSION_LENGTH]int{67, 0, 3, 222222, 32823})
// Failure cases.
testF := func(s string) {
_, err := parseAFDOVersion(s)
assert.NotNil(t, err)
}
- testF("chromeos-chrome-amd64-66.0.3336.3_rc-rr.afdo.bz2")
- testF("chromeos-chrome-amd64-66.0.3336.d_rc-r1.afdo.bz2")
- testF("chromeos-chrome-amd64-66.0.333b.3_rc-r1.afdo.bz2")
- testF("chromeos-chrome-amd64-L6.0.3336.3_rc-r1.afdo.bz2")
+ testF("chromeos-chrome-amd64-66.0.3336.3_rc-rr-merged.afdo.bz2")
+ testF("chromeos-chrome-amd64-66.0.3336.d_rc-r1-merged.afdo.bz2")
+ testF("chromeos-chrome-amd64-66.0.333b.3_rc-r1-merged.afdo.bz2")
+ testF("chromeos-chrome-amd64-L6.0.3336.3_rc-r1-merged.afdo.bz2")
testF("66.0.3336.3_rc-r1")
testF("chromeos-chrome-amd64-66.0.3336.3_rc-r1")
- testF("66.0.3336.3_rc-rr.afdo.bz2")
+ testF("66.0.3336.3_rc-rr-merged.afdo.bz2")
testF("")
}
@@ -61,7 +61,7 @@
test(afdoRevNext, afdoRevPrev, true)
t2 := func(a, b [AFDO_VERSION_LENGTH]int, expect bool) {
- tmpl := "chromeos-chrome-amd64-%d.%d.%d.%d_rc-r%d.afdo.bz2"
+ tmpl := "chromeos-chrome-amd64-%d.%d.%d.%d_rc-r%d-merged.afdo.bz2"
verA := fmt.Sprintf(tmpl, a[0], a[1], a[2], a[3], a[4])
verB := fmt.Sprintf(tmpl, b[0], b[1], b[2], b[3], b[4])
test(verA, verB, expect)
