Merge #69827 #71005

69827: roachtest: update version map and test fixtures for 22.1 r=celiala a=celiala Shortly after [Creating a release branch](https://cockroachlabs.atlassian.net/wiki/spaces/ENG/pages/187859111/Creating+a+release+branch) for release-21.2, we'll want to merge PRs as instructed by the [New major version checklist](https://cockroachlabs.atlassian.net/wiki/spaces/ENG/pages/1522270228/New+major+version+checklist). This PR is for Step 2a + Step 2b of the [New major version checklist](https://cockroachlabs.atlassian.net/wiki/spaces/ENG/pages/1522270228/New+major+version+checklist), where we update the `PredecessorVersion` map in the `roachtest` package to add an entry for the `${vNEXT}` major release, as well as generate the fixtures for acceptance/mixed-version for `${vBRANCH_CUT}` so that the test can run on `${vNEXT}`. This PR is one of the tasks detailed in #70751, which tracks all the steps relevant to creating a release branch for `${vBRANCH_CUT}` and preparing master for the `${vNEXT}` major version. Release justification: Non-production code change. Release note: None 71005: bazel: bump the sizes of some tests r=jlinder a=rickystewart These have all recently timed out in CI. Release note: None Co-authored-by: Celia La <[email protected]> Co-authored-by: Ricky Stewart <[email protected]>
cockroachdb · Oct 1, 2021 · 42730df · 42730df
3 parents 6961f28 + f8cfdae + 6e06e82
commit 42730df
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 4 deletions.
diff --git a/pkg/ccl/benchccl/rttanalysisccl/BUILD.bazel b/pkg/ccl/benchccl/rttanalysisccl/BUILD.bazel
@@ -19,6 +19,7 @@ go_library(
 
 go_test(
     name = "rttanalysisccl_test",
+    size = "large",
     srcs = [
         "bench_test.go",
         "multi_region_bench_test.go",

diff --git a/pkg/ccl/cliccl/BUILD.bazel b/pkg/ccl/cliccl/BUILD.bazel
@@ -62,7 +62,7 @@ go_library(
 
 go_test(
     name = "cliccl_test",
-    size = "small",
+    size = "medium",
     srcs = [
         "debug_backup_test.go",
         "main_test.go",

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)

diff --git a/pkg/server/BUILD.bazel b/pkg/server/BUILD.bazel
@@ -261,7 +261,7 @@ go_library(
 
 go_test(
     name = "server_test",
-    size = "medium",
+    size = "large",
     srcs = [
         "addjoin_test.go",
         "admin_cluster_test.go",