Skip to content

Commit 0570f6a

Browse files
celialaclaude
andcommitted
logictest: remove local-mixed-25.2 test configuration
Part of the quarterly M.4 "Bump MinSupported" task as outlined in `pkg/clusterversion/README.md`. After bumping MinSupported from v25.2 to v25.3, the local-mixed-25.2 test configuration is no longer needed since it simulates a mixed-version cluster with v25.2 nodes, which can no longer connect to the cluster. This commit: - Removes the local-mixed-25.2 config from logictestbase.go - Removes it from the default-configs and schema-locked-disabled sets - Deletes the generated test directories for local-mixed-25.2 - Removes all references from logic test files (skipif/onlyif directives) - Removes empty LogicTest directive lines that resulted from deletions - Regenerates Bazel BUILD files via \`./dev gen bazel\` Changes affect test files that had skipif or onlyif directives referencing local-mixed-25.2, plus the generated test files and BUILD files that were auto-generated based on the removed configuration. Part of #147634 (reference PR for this quarterly task). Release note: None 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <[email protected]>
1 parent d004431 commit 0570f6a

File tree

57 files changed

+87
-5088
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+87
-5088
lines changed

build/teamcity/cockroach/nightlies/sqllogic_corpus_nightly_impl.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ if [ $exit_status = 0 ]; then
8181
fi
8282

8383
# Generate a corpus for all mixed version variants
84-
for config in local-mixed-25.2; do
84+
for config in local-mixed-25.3 local-mixed-25.4; do
8585
$BAZEL_BIN/pkg/cmd/bazci/bazci_/bazci test -- --config=ci \
8686
//pkg/sql/logictest/tests/$config/... \
8787
--test_arg=--declarative-corpus=$ARTIFACTS_DIR/corpus-mixed \

pkg/BUILD.bazel

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ ALL_TESTS = [
6060
"//pkg/ccl/logictestccl/tests/fakedist-vec-off:fakedist-vec-off_test",
6161
"//pkg/ccl/logictestccl/tests/fakedist:fakedist_test",
6262
"//pkg/ccl/logictestccl/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
63-
"//pkg/ccl/logictestccl/tests/local-mixed-25.2:local-mixed-25_2_test",
6463
"//pkg/ccl/logictestccl/tests/local-mixed-25.3:local-mixed-25_3_test",
6564
"//pkg/ccl/logictestccl/tests/local-mixed-25.4:local-mixed-25_4_test",
6665
"//pkg/ccl/logictestccl/tests/local-prepared:local-prepared_test",
@@ -519,15 +518,13 @@ ALL_TESTS = [
519518
"//pkg/sql/logictest/logictestbase:logictestbase_test",
520519
"//pkg/sql/logictest/tests/5node-disk:5node-disk_test",
521520
"//pkg/sql/logictest/tests/5node:5node_test",
522-
"//pkg/sql/logictest/tests/cockroach-go-testserver-25.2:cockroach-go-testserver-25_2_test",
523521
"//pkg/sql/logictest/tests/cockroach-go-testserver-25.3:cockroach-go-testserver-25_3_test",
524522
"//pkg/sql/logictest/tests/cockroach-go-testserver-25.4:cockroach-go-testserver-25_4_test",
525523
"//pkg/sql/logictest/tests/fakedist-disk:fakedist-disk_test",
526524
"//pkg/sql/logictest/tests/fakedist-vec-off:fakedist-vec-off_test",
527525
"//pkg/sql/logictest/tests/fakedist:fakedist_test",
528526
"//pkg/sql/logictest/tests/local-leased-descriptors:local-leased-descriptors_test",
529527
"//pkg/sql/logictest/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
530-
"//pkg/sql/logictest/tests/local-mixed-25.2:local-mixed-25_2_test",
531528
"//pkg/sql/logictest/tests/local-mixed-25.3:local-mixed-25_3_test",
532529
"//pkg/sql/logictest/tests/local-mixed-25.4:local-mixed-25_4_test",
533530
"//pkg/sql/logictest/tests/local-prepared:local-prepared_test",
@@ -615,7 +612,6 @@ ALL_TESTS = [
615612
"//pkg/sql/schemachanger/scpb:scpb_test",
616613
"//pkg/sql/schemachanger/scplan/internal/opgen:opgen_test",
617614
"//pkg/sql/schemachanger/scplan/internal/rules/current:current_test",
618-
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_2:release_25_2_test",
619615
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_3:release_25_3_test",
620616
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_4:release_25_4_test",
621617
"//pkg/sql/schemachanger/scplan/internal/scgraph:scgraph_test",
@@ -649,7 +645,6 @@ ALL_TESTS = [
649645
"//pkg/sql/sqlitelogictest/tests/fakedist-vec-off:fakedist-vec-off_test",
650646
"//pkg/sql/sqlitelogictest/tests/fakedist:fakedist_test",
651647
"//pkg/sql/sqlitelogictest/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
652-
"//pkg/sql/sqlitelogictest/tests/local-mixed-25.2:local-mixed-25_2_test",
653648
"//pkg/sql/sqlitelogictest/tests/local-mixed-25.3:local-mixed-25_3_test",
654649
"//pkg/sql/sqlitelogictest/tests/local-mixed-25.4:local-mixed-25_4_test",
655650
"//pkg/sql/sqlitelogictest/tests/local-prepared:local-prepared_test",
@@ -1003,7 +998,6 @@ GO_TARGETS = [
1003998
"//pkg/ccl/logictestccl/tests/fakedist-vec-off:fakedist-vec-off_test",
1004999
"//pkg/ccl/logictestccl/tests/fakedist:fakedist_test",
10051000
"//pkg/ccl/logictestccl/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
1006-
"//pkg/ccl/logictestccl/tests/local-mixed-25.2:local-mixed-25_2_test",
10071001
"//pkg/ccl/logictestccl/tests/local-mixed-25.3:local-mixed-25_3_test",
10081002
"//pkg/ccl/logictestccl/tests/local-mixed-25.4:local-mixed-25_4_test",
10091003
"//pkg/ccl/logictestccl/tests/local-prepared:local-prepared_test",
@@ -2098,15 +2092,13 @@ GO_TARGETS = [
20982092
"//pkg/sql/logictest/logictestbase:logictestbase_test",
20992093
"//pkg/sql/logictest/tests/5node-disk:5node-disk_test",
21002094
"//pkg/sql/logictest/tests/5node:5node_test",
2101-
"//pkg/sql/logictest/tests/cockroach-go-testserver-25.2:cockroach-go-testserver-25_2_test",
21022095
"//pkg/sql/logictest/tests/cockroach-go-testserver-25.3:cockroach-go-testserver-25_3_test",
21032096
"//pkg/sql/logictest/tests/cockroach-go-testserver-25.4:cockroach-go-testserver-25_4_test",
21042097
"//pkg/sql/logictest/tests/fakedist-disk:fakedist-disk_test",
21052098
"//pkg/sql/logictest/tests/fakedist-vec-off:fakedist-vec-off_test",
21062099
"//pkg/sql/logictest/tests/fakedist:fakedist_test",
21072100
"//pkg/sql/logictest/tests/local-leased-descriptors:local-leased-descriptors_test",
21082101
"//pkg/sql/logictest/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
2109-
"//pkg/sql/logictest/tests/local-mixed-25.2:local-mixed-25_2_test",
21102102
"//pkg/sql/logictest/tests/local-mixed-25.3:local-mixed-25_3_test",
21112103
"//pkg/sql/logictest/tests/local-mixed-25.4:local-mixed-25_4_test",
21122104
"//pkg/sql/logictest/tests/local-prepared:local-prepared_test",
@@ -2305,8 +2297,6 @@ GO_TARGETS = [
23052297
"//pkg/sql/schemachanger/scplan/internal/opgen:opgen_test",
23062298
"//pkg/sql/schemachanger/scplan/internal/rules/current:current",
23072299
"//pkg/sql/schemachanger/scplan/internal/rules/current:current_test",
2308-
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_2:release_25_2",
2309-
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_2:release_25_2_test",
23102300
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_3:release_25_3",
23112301
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_3:release_25_3_test",
23122302
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_4:release_25_4",
@@ -2389,7 +2379,6 @@ GO_TARGETS = [
23892379
"//pkg/sql/sqlitelogictest/tests/fakedist-vec-off:fakedist-vec-off_test",
23902380
"//pkg/sql/sqlitelogictest/tests/fakedist:fakedist_test",
23912381
"//pkg/sql/sqlitelogictest/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
2392-
"//pkg/sql/sqlitelogictest/tests/local-mixed-25.2:local-mixed-25_2_test",
23932382
"//pkg/sql/sqlitelogictest/tests/local-mixed-25.3:local-mixed-25_3_test",
23942383
"//pkg/sql/sqlitelogictest/tests/local-mixed-25.4:local-mixed-25_4_test",
23952384
"//pkg/sql/sqlitelogictest/tests/local-prepared:local-prepared_test",

pkg/ccl/logictestccl/testdata/logic_test/buffered_writes_lock_loss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# LogicTest: !3node-tenant !local-mixed-25.2
1+
# LogicTest: !3node-tenant
22
# cluster-opt: disable-mvcc-range-tombstones-for-point-deletes
33

44
# We set the max_buffer_size to avoid unexpected buffer flush since this test expects certain writes to have been

pkg/ccl/logictestccl/testdata/logic_test/provisioning

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# LogicTest: !local-mixed-25.2
21
# Tests for parsing/validation of the PROVISIONSRC role option.
32

43
statement error role "root" cannot have a PROVISIONSRC

pkg/ccl/logictestccl/testdata/logic_test/redact_descriptor

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ CREATE VIEW redacted_descriptors AS
4848
# descriptor. We will skip the config that uses legacy schema changer.
4949
skipif config local-schema-locked
5050
skipif config local-legacy-schema-changer
51-
skipif config local-mixed-25.2
5251
query T
5352
SELECT descriptor from redacted_descriptors where id = 'collate_partition'::REGCLASS;
5453
----

pkg/ccl/logictestccl/testdata/logic_test/triggers

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -930,11 +930,11 @@ statement ok
930930
CREATE TRIGGER foo AFTER INSERT ON xy FOR EACH ROW EXECUTE FUNCTION trigger_func();
931931

932932
# Relations are referenced by name, so renaming the table is not allowed.
933-
onlyif config local-legacy-schema-changer local-mixed-25.2 local-mixed-25.3
933+
onlyif config local-legacy-schema-changer local-mixed-25.3
934934
statement error pgcode 2BP01 cannot rename relation "t" because trigger "foo" on table "xy" depends on it
935935
ALTER TABLE t RENAME TO t2;
936936

937-
skipif config local-legacy-schema-changer local-mixed-25.2 local-mixed-25.3
937+
skipif config local-legacy-schema-changer local-mixed-25.3
938938
statement error pgcode 2BP01 cannot rename relation "test.public.t" because trigger "foo" on table "xy" depends on it
939939
ALTER TABLE t RENAME TO t2;
940940

pkg/ccl/logictestccl/tests/local-mixed-25.2/BUILD.bazel

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)