roachtest: update version map and test fixtures for 22.1

Release justification: Non-production code change. Release note: None
cockroachdb · Oct 1, 2021 · f8cfdae · f8cfdae
1 parent 5f53feb
commit f8cfdae
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 2 deletions.
diff --git a/pkg/cmd/roachtest/fixtures/1/checkpoint-v21.2.tgz b/pkg/cmd/roachtest/fixtures/1/checkpoint-v21.2.tgz
diff --git a/pkg/cmd/roachtest/fixtures/2/checkpoint-v21.2.tgz b/pkg/cmd/roachtest/fixtures/2/checkpoint-v21.2.tgz
diff --git a/pkg/cmd/roachtest/fixtures/3/checkpoint-v21.2.tgz b/pkg/cmd/roachtest/fixtures/3/checkpoint-v21.2.tgz
diff --git a/pkg/cmd/roachtest/fixtures/4/checkpoint-v21.2.tgz b/pkg/cmd/roachtest/fixtures/4/checkpoint-v21.2.tgz
diff --git a/pkg/cmd/roachtest/tests/predecessor_version.go b/pkg/cmd/roachtest/tests/predecessor_version.go
@@ -36,7 +36,8 @@ func PredecessorVersion(buildVersion version.Version) (string, error) {
 	// checkpoint option enabled to create the missing store directory
 	// fixture (see runVersionUpgrade).
 	verMap := map[string]string{
-		"21.2": "21.1.8",
+		"22.1": "21.2.0-beta.2",
+		"21.2": "21.1.9",
 		"21.1": "20.2.12",
 		"20.2": "20.1.16",
 		"20.1": "19.2.11",

diff --git a/pkg/cmd/roachtest/tests/versionupgrade.go b/pkg/cmd/roachtest/tests/versionupgrade.go
@@ -467,7 +467,7 @@ func waitForUpgradeStep(nodes option.NodeListOption) versionStep {
 		t.L().Printf("%s: waiting for cluster to auto-upgrade\n", newVersion)
 
 		for _, i := range nodes {
-			err := retry.ForDuration(30*time.Second, func() error {
+			err := retry.ForDuration(5*time.Minute, func() error {
 				currentVersion := u.clusterVersion(ctx, t, i).String()
 				if currentVersion != newVersion {
 					return fmt.Errorf("%d: expected version %s, got %s", i, newVersion, currentVersion)