Merge #60615

60615: roachtest: update version maps with v20.1.12 and v20.2.5 r=pbardea a=asubiotto Release note: None Co-authored-by: Alfonso Subiotto Marques <[email protected]>
cockroachdb · Feb 16, 2021 · 14ac1cf · 14ac1cf
2 parents 314afa3 + e839301
commit 14ac1cf
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 3 deletions.
diff --git a/pkg/cmd/roachtest/fixtures/1/checkpoint-v20.1.tgz b/pkg/cmd/roachtest/fixtures/1/checkpoint-v20.1.tgz
diff --git a/pkg/cmd/roachtest/fixtures/1/checkpoint-v20.2.tgz b/pkg/cmd/roachtest/fixtures/1/checkpoint-v20.2.tgz
diff --git a/pkg/cmd/roachtest/fixtures/2/checkpoint-v20.1.tgz b/pkg/cmd/roachtest/fixtures/2/checkpoint-v20.1.tgz
diff --git a/pkg/cmd/roachtest/fixtures/2/checkpoint-v20.2.tgz b/pkg/cmd/roachtest/fixtures/2/checkpoint-v20.2.tgz
diff --git a/pkg/cmd/roachtest/fixtures/3/checkpoint-v20.1.tgz b/pkg/cmd/roachtest/fixtures/3/checkpoint-v20.1.tgz
diff --git a/pkg/cmd/roachtest/fixtures/3/checkpoint-v20.2.tgz b/pkg/cmd/roachtest/fixtures/3/checkpoint-v20.2.tgz
diff --git a/pkg/cmd/roachtest/fixtures/4/checkpoint-v20.1.tgz b/pkg/cmd/roachtest/fixtures/4/checkpoint-v20.1.tgz
diff --git a/pkg/cmd/roachtest/fixtures/4/checkpoint-v20.2.tgz b/pkg/cmd/roachtest/fixtures/4/checkpoint-v20.2.tgz
diff --git a/pkg/cmd/roachtest/test_runner.go b/pkg/cmd/roachtest/test_runner.go
@@ -1183,8 +1183,8 @@ func PredecessorVersion(buildVersion version.Version) (string, error) {
 	// (see runVersionUpgrade). The same is true for adding a new key to this
 	// map.
 	verMap := map[string]string{
-		"21.1": "20.2.4",
-		"20.2": "20.1.10",
+		"21.1": "20.2.5",
+		"20.2": "20.1.12",
 		"20.1": "19.2.11",
 		"19.2": "19.1.11",
 		"19.1": "2.1.9",

diff --git a/pkg/cmd/roachtest/versionupgrade.go b/pkg/cmd/roachtest/versionupgrade.go
@@ -94,7 +94,7 @@ func runVersionUpgrade(ctx context.Context, t *test, c *cluster, buildVersion ve
 		// The version to create/update the fixture for. Must be released (i.e.
 		// can download it from the homepage); if that is not the case use the
 		// empty string which uses the local cockroach binary.
-		newV := "20.2.4"
+		newV := "20.2.5"
 		predV, err := PredecessorVersion(*version.MustParse("v" + newV))
 		if err != nil {
 			t.Fatal(err)