File tree Expand file tree Collapse file tree 9 files changed +169
-4
lines changed
cli/testdata/declarative-rules
tests/cockroach-go-testserver-25.3 Expand file tree Collapse file tree 9 files changed +169
-4
lines changed Original file line number Diff line number Diff line change @@ -508,6 +508,7 @@ ALL_TESTS = [
508
508
"//pkg/sql/logictest/tests/5node-disk:5node-disk_test" ,
509
509
"//pkg/sql/logictest/tests/5node:5node_test" ,
510
510
"//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" ,
511
512
"//pkg/sql/logictest/tests/fakedist-disk:fakedist-disk_test" ,
512
513
"//pkg/sql/logictest/tests/fakedist-vec-off:fakedist-vec-off_test" ,
513
514
"//pkg/sql/logictest/tests/fakedist:fakedist_test" ,
@@ -2053,6 +2054,7 @@ GO_TARGETS = [
2053
2054
"//pkg/sql/logictest/tests/5node-disk:5node-disk_test" ,
2054
2055
"//pkg/sql/logictest/tests/5node:5node_test" ,
2055
2056
"//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" ,
2056
2058
"//pkg/sql/logictest/tests/fakedist-disk:fakedist-disk_test" ,
2057
2059
"//pkg/sql/logictest/tests/fakedist-vec-off:fakedist-vec-off_test" ,
2058
2060
"//pkg/sql/logictest/tests/fakedist:fakedist_test" ,
Original file line number Diff line number Diff line change 1
1
dep
2
2
----
3
- debug declarative-print-rules 1000025.2 dep
3
+ debug declarative-print-rules 1000025.3 dep
4
4
deprules
5
5
----
6
6
- name: 'CheckConstraint transitions to ABSENT uphold 2-version invariant: PUBLIC->VALIDATED'
Original file line number Diff line number Diff line change @@ -283,7 +283,7 @@ const MinSupported Key = V25_2
283
283
284
284
// PreviousRelease is the logical cluster version of the previous release (which must
285
285
// have at least an RC build published).
286
- const PreviousRelease Key = V25_2
286
+ const PreviousRelease Key = V25_3
287
287
288
288
// V25_4 is a placeholder that will eventually be replaced by the actual 25.4
289
289
// version Key, but in the meantime it points to the latest Key. The placeholder
Original file line number Diff line number Diff line change @@ -2889,7 +2889,7 @@ func TestGetWriterType(t *testing.T) {
2889
2889
2890
2890
t .Run ("immediate-mode" , func (t * testing.T ) {
2891
2891
st := cluster .MakeTestingClusterSettingsWithVersions (
2892
- clusterversion .V25_2 .Version (),
2892
+ clusterversion .V25_3 .Version (),
2893
2893
clusterversion .PreviousRelease .Version (),
2894
2894
true , /* initializeVersion */
2895
2895
)
Original file line number Diff line number Diff line change @@ -39,8 +39,10 @@ filegroup(
39
39
visibility = [
40
40
"//pkg/ccl/logictestccl/tests/cockroach-go-testserver-25.1:__pkg__" ,
41
41
"//pkg/ccl/logictestccl/tests/cockroach-go-testserver-25.2:__pkg__" ,
42
+ "//pkg/ccl/logictestccl/tests/cockroach-go-testserver-25.3:__pkg__" ,
42
43
"//pkg/sql/logictest/tests/cockroach-go-testserver-25.1:__pkg__" ,
43
44
"//pkg/sql/logictest/tests/cockroach-go-testserver-25.2:__pkg__" ,
45
+ "//pkg/sql/logictest/tests/cockroach-go-testserver-25.3:__pkg__" ,
44
46
],
45
47
)
46
48
Original file line number Diff line number Diff line change @@ -520,6 +520,14 @@ var LogicTestConfigs = []TestClusterConfig{
520
520
BootstrapVersion : clusterversion .V25_2 ,
521
521
NumNodes : 3 ,
522
522
},
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
+ },
523
531
}
524
532
525
533
// ConfigIdx is an index in the above slice.
@@ -640,6 +648,7 @@ var DefaultConfigSets = map[string]ConfigSet{
640
648
// Special alias for all testserver configs (for mixed-version testing).
641
649
"cockroach-go-testserver-configs" : makeConfigSet (
642
650
"cockroach-go-testserver-25.2" ,
651
+ "cockroach-go-testserver-25.3" ,
643
652
),
644
653
645
654
// Special alias for configs where schema locked is disabled.
Original file line number Diff line number Diff line change 1
- # LogicTest: cockroach-go-testserver-configs
1
+ # LogicTest: cockroach-go-testserver-25.2
2
2
3
3
# Test version gating of op classes in vector index
4
4
Original file line number Diff line number Diff line change
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
+ )
You can’t perform that action at this time.
0 commit comments