Merge #64610

64610: roachtest: update version map and test fixtures for 21.2 r=tbg a=j-low Fixes #64595. Fixes #64594. Fixes #64537. Fixes #64525. Fixes #64596. Fixes #58237. Fixes #64603. Fixes #64611. Release note: None Co-authored-by: Joseph Lowinske <[email protected]>
cockroachdb · May 4, 2021 · e3327f0 · e3327f0
2 parents 3f872bd + debd06a
commit e3327f0
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 1 deletion.
diff --git a/pkg/cmd/roachtest/fixtures/1/checkpoint-v21.1.tgz b/pkg/cmd/roachtest/fixtures/1/checkpoint-v21.1.tgz
diff --git a/pkg/cmd/roachtest/fixtures/2/checkpoint-v21.1.tgz b/pkg/cmd/roachtest/fixtures/2/checkpoint-v21.1.tgz
diff --git a/pkg/cmd/roachtest/fixtures/3/checkpoint-v21.1.tgz b/pkg/cmd/roachtest/fixtures/3/checkpoint-v21.1.tgz
diff --git a/pkg/cmd/roachtest/fixtures/4/checkpoint-v21.1.tgz b/pkg/cmd/roachtest/fixtures/4/checkpoint-v21.1.tgz
diff --git a/pkg/cmd/roachtest/test_runner.go b/pkg/cmd/roachtest/test_runner.go
@@ -1197,6 +1197,7 @@ 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.2": "21.1.0-beta.5",
 		"21.1": "20.2.8",
 		"20.2": "20.1.15",
 		"20.1": "19.2.11",

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.8"
+		newV := "21.1.0-beta.5"
 		predV, err := PredecessorVersion(*version.MustParse("v" + newV))
 		if err != nil {
 			t.Fatal(err)