Skip to content

Commit b4a7d05

Browse files
nameisbhaskarRaduBerinde
authored andcommitted
clusterversion: bump PreviousVersion
Bump PreviousVersion to 25.3, add cockroach-go-testserver-25.3 tests. This is part of the [M.3 checklist](https://github.com/cockroachdb/cockroach/blob/master/pkg/clusterversion/README.md#m3-enable-upgrade-tests) (the roachtest fixtures were already done in #150712). - [x] Update `PreviousRelease` constant to 25.3. - [x] Verify the logic in `supportsSkipUpgradeTo` (`pkg/cmd/roachtest/roachtestutil/mixedversion/mixedversion.go`) is correct for the new release. - [x] Add `cockroach-go-testserver-25.3` logictest config and add it to `cockroach-go-testserver-configs`. Update the visibility for `cockroach_predecessor_version` in `pkg/sql/logictest/BUILD.bazel`. Run `./dev gen` and fix up any tests that fail (using a draft PR helps). - [x] Check that all gates for the previous release are identical on the `master` and release branch. Epic: REL-2736 Release note: None
1 parent 2eb84bc commit b4a7d05

File tree

9 files changed

+169
-4
lines changed

9 files changed

+169
-4
lines changed

pkg/BUILD.bazel

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -508,6 +508,7 @@ ALL_TESTS = [
508508
"//pkg/sql/logictest/tests/5node-disk:5node-disk_test",
509509
"//pkg/sql/logictest/tests/5node:5node_test",
510510
"//pkg/sql/logictest/tests/cockroach-go-testserver-25.2:cockroach-go-testserver-25_2_test",
511+
"//pkg/sql/logictest/tests/cockroach-go-testserver-25.3:cockroach-go-testserver-25_3_test",
511512
"//pkg/sql/logictest/tests/fakedist-disk:fakedist-disk_test",
512513
"//pkg/sql/logictest/tests/fakedist-vec-off:fakedist-vec-off_test",
513514
"//pkg/sql/logictest/tests/fakedist:fakedist_test",
@@ -2053,6 +2054,7 @@ GO_TARGETS = [
20532054
"//pkg/sql/logictest/tests/5node-disk:5node-disk_test",
20542055
"//pkg/sql/logictest/tests/5node:5node_test",
20552056
"//pkg/sql/logictest/tests/cockroach-go-testserver-25.2:cockroach-go-testserver-25_2_test",
2057+
"//pkg/sql/logictest/tests/cockroach-go-testserver-25.3:cockroach-go-testserver-25_3_test",
20562058
"//pkg/sql/logictest/tests/fakedist-disk:fakedist-disk_test",
20572059
"//pkg/sql/logictest/tests/fakedist-vec-off:fakedist-vec-off_test",
20582060
"//pkg/sql/logictest/tests/fakedist:fakedist_test",

pkg/cli/testdata/declarative-rules/deprules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dep
22
----
3-
debug declarative-print-rules 1000025.2 dep
3+
debug declarative-print-rules 1000025.3 dep
44
deprules
55
----
66
- name: 'CheckConstraint transitions to ABSENT uphold 2-version invariant: PUBLIC->VALIDATED'

pkg/clusterversion/cockroach_versions.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ const MinSupported Key = V25_2
283283

284284
// PreviousRelease is the logical cluster version of the previous release (which must
285285
// have at least an RC build published).
286-
const PreviousRelease Key = V25_2
286+
const PreviousRelease Key = V25_3
287287

288288
// V25_4 is a placeholder that will eventually be replaced by the actual 25.4
289289
// version Key, but in the meantime it points to the latest Key. The placeholder

pkg/crosscluster/logical/logical_replication_job_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2889,7 +2889,7 @@ func TestGetWriterType(t *testing.T) {
28892889

28902890
t.Run("immediate-mode", func(t *testing.T) {
28912891
st := cluster.MakeTestingClusterSettingsWithVersions(
2892-
clusterversion.V25_2.Version(),
2892+
clusterversion.V25_3.Version(),
28932893
clusterversion.PreviousRelease.Version(),
28942894
true, /* initializeVersion */
28952895
)

pkg/sql/logictest/BUILD.bazel

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,10 @@ filegroup(
3939
visibility = [
4040
"//pkg/ccl/logictestccl/tests/cockroach-go-testserver-25.1:__pkg__",
4141
"//pkg/ccl/logictestccl/tests/cockroach-go-testserver-25.2:__pkg__",
42+
"//pkg/ccl/logictestccl/tests/cockroach-go-testserver-25.3:__pkg__",
4243
"//pkg/sql/logictest/tests/cockroach-go-testserver-25.1:__pkg__",
4344
"//pkg/sql/logictest/tests/cockroach-go-testserver-25.2:__pkg__",
45+
"//pkg/sql/logictest/tests/cockroach-go-testserver-25.3:__pkg__",
4446
],
4547
)
4648

pkg/sql/logictest/logictestbase/logictestbase.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -520,6 +520,14 @@ var LogicTestConfigs = []TestClusterConfig{
520520
BootstrapVersion: clusterversion.V25_2,
521521
NumNodes: 3,
522522
},
523+
{
524+
// This config runs a cluster with 3 nodes, with a separate process per
525+
// node. The nodes initially start on v25.3.
526+
Name: "cockroach-go-testserver-25.3",
527+
UseCockroachGoTestserver: true,
528+
BootstrapVersion: clusterversion.V25_3,
529+
NumNodes: 3,
530+
},
523531
}
524532

525533
// ConfigIdx is an index in the above slice.
@@ -640,6 +648,7 @@ var DefaultConfigSets = map[string]ConfigSet{
640648
// Special alias for all testserver configs (for mixed-version testing).
641649
"cockroach-go-testserver-configs": makeConfigSet(
642650
"cockroach-go-testserver-25.2",
651+
"cockroach-go-testserver-25.3",
643652
),
644653

645654
// Special alias for configs where schema locked is disabled.

pkg/sql/logictest/testdata/logic_test/vector_index_mixed

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# LogicTest: cockroach-go-testserver-configs
1+
# LogicTest: cockroach-go-testserver-25.2
22

33
# Test version gating of op classes in vector index
44

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
load("@io_bazel_rules_go//go:def.bzl", "go_test")
2+
3+
go_test(
4+
name = "cockroach-go-testserver-25_3_test",
5+
size = "enormous",
6+
srcs = ["generated_test.go"],
7+
data = [
8+
"//c-deps:libgeos", # keep
9+
"//pkg/cmd/cockroach-short", # keep
10+
"//pkg/sql/logictest:cockroach_predecessor_version", # keep
11+
"//pkg/sql/logictest:testdata", # keep
12+
],
13+
exec_properties = {"test.Pool": "heavy"},
14+
shard_count = 7,
15+
tags = ["cpu:3"],
16+
deps = [
17+
"//pkg/base",
18+
"//pkg/build/bazel",
19+
"//pkg/security/securityassets",
20+
"//pkg/security/securitytest",
21+
"//pkg/server",
22+
"//pkg/sql/logictest",
23+
"//pkg/testutils/serverutils",
24+
"//pkg/testutils/skip",
25+
"//pkg/testutils/testcluster",
26+
"//pkg/util/leaktest",
27+
"//pkg/util/randutil",
28+
],
29+
)

pkg/sql/logictest/tests/cockroach-go-testserver-25.3/generated_test.go

Lines changed: 123 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)