Skip to content

Commit 75212a9

Browse files
craig[bot]shailendra-patel
andcommitted
Merge #151115
151115: logictest: enable local-mixed-25.3 config r=shailendra-patel a=shailendra-patel **bootstrap: add 25.3 bootstrap data** Obtained by running (on release-25.3 branch): ``` ./dev build sql-bootstrap-data && bin/sql-bootstrap-data ``` Epic: none Release note: None Fixes: [REL-2735](https://cockroachlabs.atlassian.net/browse/REL-2735) Co-authored-by: Shailendra Patel <[email protected]>
2 parents 08d1e04 + 7cc44c2 commit 75212a9

File tree

20 files changed

+5080
-13
lines changed

20 files changed

+5080
-13
lines changed

pkg/BUILD.bazel

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ ALL_TESTS = [
6060
"//pkg/ccl/logictestccl/tests/fakedist:fakedist_test",
6161
"//pkg/ccl/logictestccl/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
6262
"//pkg/ccl/logictestccl/tests/local-mixed-25.2:local-mixed-25_2_test",
63+
"//pkg/ccl/logictestccl/tests/local-mixed-25.3:local-mixed-25_3_test",
6364
"//pkg/ccl/logictestccl/tests/local-read-committed:local-read-committed_test",
6465
"//pkg/ccl/logictestccl/tests/local-repeatable-read:local-repeatable-read_test",
6566
"//pkg/ccl/logictestccl/tests/local-vec-off:local-vec-off_test",
@@ -511,6 +512,7 @@ ALL_TESTS = [
511512
"//pkg/sql/logictest/tests/fakedist:fakedist_test",
512513
"//pkg/sql/logictest/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
513514
"//pkg/sql/logictest/tests/local-mixed-25.2:local-mixed-25_2_test",
515+
"//pkg/sql/logictest/tests/local-mixed-25.3:local-mixed-25_3_test",
514516
"//pkg/sql/logictest/tests/local-vec-off:local-vec-off_test",
515517
"//pkg/sql/logictest/tests/local:local_test",
516518
"//pkg/sql/logictest/tests/multiregion-9node-3region-3azs:multiregion-9node-3region-3azs_test",
@@ -528,6 +530,7 @@ ALL_TESTS = [
528530
"//pkg/sql/opt/exec/execbuilder/tests/fakedist:fakedist_test",
529531
"//pkg/sql/opt/exec/execbuilder/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
530532
"//pkg/sql/opt/exec/execbuilder/tests/local-mixed-25.2:local-mixed-25_2_test",
533+
"//pkg/sql/opt/exec/execbuilder/tests/local-mixed-25.3:local-mixed-25_3_test",
531534
"//pkg/sql/opt/exec/execbuilder/tests/local-vec-off:local-vec-off_test",
532535
"//pkg/sql/opt/exec/execbuilder/tests/local:local_test",
533536
"//pkg/sql/opt/exec/execbuilder:execbuilder_test",
@@ -633,6 +636,7 @@ ALL_TESTS = [
633636
"//pkg/sql/sqlitelogictest/tests/fakedist:fakedist_test",
634637
"//pkg/sql/sqlitelogictest/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
635638
"//pkg/sql/sqlitelogictest/tests/local-mixed-25.2:local-mixed-25_2_test",
639+
"//pkg/sql/sqlitelogictest/tests/local-mixed-25.3:local-mixed-25_3_test",
636640
"//pkg/sql/sqlitelogictest/tests/local-read-committed:local-read-committed_test",
637641
"//pkg/sql/sqlitelogictest/tests/local-repeatable-read:local-repeatable-read_test",
638642
"//pkg/sql/sqlitelogictest/tests/local-vec-off:local-vec-off_test",
@@ -973,6 +977,7 @@ GO_TARGETS = [
973977
"//pkg/ccl/logictestccl/tests/fakedist:fakedist_test",
974978
"//pkg/ccl/logictestccl/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
975979
"//pkg/ccl/logictestccl/tests/local-mixed-25.2:local-mixed-25_2_test",
980+
"//pkg/ccl/logictestccl/tests/local-mixed-25.3:local-mixed-25_3_test",
976981
"//pkg/ccl/logictestccl/tests/local-read-committed:local-read-committed_test",
977982
"//pkg/ccl/logictestccl/tests/local-repeatable-read:local-repeatable-read_test",
978983
"//pkg/ccl/logictestccl/tests/local-vec-off:local-vec-off_test",
@@ -2049,6 +2054,7 @@ GO_TARGETS = [
20492054
"//pkg/sql/logictest/tests/fakedist:fakedist_test",
20502055
"//pkg/sql/logictest/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
20512056
"//pkg/sql/logictest/tests/local-mixed-25.2:local-mixed-25_2_test",
2057+
"//pkg/sql/logictest/tests/local-mixed-25.3:local-mixed-25_3_test",
20522058
"//pkg/sql/logictest/tests/local-vec-off:local-vec-off_test",
20532059
"//pkg/sql/logictest/tests/local:local_test",
20542060
"//pkg/sql/logictest/tests/multiregion-9node-3region-3azs:multiregion-9node-3region-3azs_test",
@@ -2075,6 +2081,7 @@ GO_TARGETS = [
20752081
"//pkg/sql/opt/exec/execbuilder/tests/fakedist:fakedist_test",
20762082
"//pkg/sql/opt/exec/execbuilder/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
20772083
"//pkg/sql/opt/exec/execbuilder/tests/local-mixed-25.2:local-mixed-25_2_test",
2084+
"//pkg/sql/opt/exec/execbuilder/tests/local-mixed-25.3:local-mixed-25_3_test",
20782085
"//pkg/sql/opt/exec/execbuilder/tests/local-vec-off:local-vec-off_test",
20792086
"//pkg/sql/opt/exec/execbuilder/tests/local:local_test",
20802087
"//pkg/sql/opt/exec/execbuilder:execbuilder",
@@ -2329,6 +2336,7 @@ GO_TARGETS = [
23292336
"//pkg/sql/sqlitelogictest/tests/fakedist:fakedist_test",
23302337
"//pkg/sql/sqlitelogictest/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
23312338
"//pkg/sql/sqlitelogictest/tests/local-mixed-25.2:local-mixed-25_2_test",
2339+
"//pkg/sql/sqlitelogictest/tests/local-mixed-25.3:local-mixed-25_3_test",
23322340
"//pkg/sql/sqlitelogictest/tests/local-read-committed:local-read-committed_test",
23332341
"//pkg/sql/sqlitelogictest/tests/local-repeatable-read:local-repeatable-read_test",
23342342
"//pkg/sql/sqlitelogictest/tests/local-vec-off:local-vec-off_test",
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
load("@io_bazel_rules_go//go:def.bzl", "go_test")
2+
3+
go_test(
4+
name = "local-mixed-25_3_test",
5+
size = "enormous",
6+
srcs = ["generated_test.go"],
7+
data = [
8+
"//c-deps:libgeos", # keep
9+
"//pkg/ccl/logictestccl:testdata", # keep
10+
],
11+
exec_properties = {"test.Pool": "large"},
12+
shard_count = 36,
13+
tags = ["cpu:1"],
14+
deps = [
15+
"//pkg/base",
16+
"//pkg/build/bazel",
17+
"//pkg/ccl",
18+
"//pkg/security/securityassets",
19+
"//pkg/security/securitytest",
20+
"//pkg/server",
21+
"//pkg/sql/logictest",
22+
"//pkg/testutils/serverutils",
23+
"//pkg/testutils/skip",
24+
"//pkg/testutils/testcluster",
25+
"//pkg/util/leaktest",
26+
"//pkg/util/randutil",
27+
],
28+
)

0 commit comments

Comments
 (0)