Skip to content

Commit 18328ee

Browse files
committed
logictest: remove local-mixed-25.3 test configuration
Part of the quarterly M.4 "Bump MinSupported" task as outlined in `pkg/clusterversion/README.md`. After bumping MinSupported from v25.3 to v25.4, the local-mixed-25.3 test configuration is no longer needed since it simulates a mixed-version cluster with v25.3 nodes, which can no longer connect to the cluster. This commit: - Removes the local-mixed-25.3 config from logictestbase.go - Removes it from the default-configs and schema-locked-disabled sets - Deletes the generated test directories for local-mixed-25.3 - 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` Note: pebbleFormatVersionMap updates are deferred to a separate PR. Following the pattern from PR #157767 (v25.2→v25.3 bump), pebble.go is not modified in the M.4 PR. The map will be updated separately once V26_1_* internal versions with Pebble format changes are added, similar to how V25_4_PebbleFormatV2BlobFiles was added before the previous M.4. Changes affect 64 test files that had skipif or onlyif directives referencing local-mixed-25.3, plus the generated test files and BUILD files that were auto-generated based on the removed configuration. Part of #157767 (reference PR for this quarterly task pattern). Release note: None
1 parent f7a19d8 commit 18328ee

File tree

39 files changed

+32
-4721
lines changed

39 files changed

+32
-4721
lines changed

pkg/BUILD.bazel

Lines changed: 0 additions & 9 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.3:local-mixed-25_3_test",
6463
"//pkg/ccl/logictestccl/tests/local-mixed-25.4:local-mixed-25_4_test",
6564
"//pkg/ccl/logictestccl/tests/local-prepared:local-prepared_test",
6665
"//pkg/ccl/logictestccl/tests/local-read-committed:local-read-committed_test",
@@ -526,7 +525,6 @@ ALL_TESTS = [
526525
"//pkg/sql/logictest/tests/fakedist:fakedist_test",
527526
"//pkg/sql/logictest/tests/local-leased-descriptors:local-leased-descriptors_test",
528527
"//pkg/sql/logictest/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
529-
"//pkg/sql/logictest/tests/local-mixed-25.3:local-mixed-25_3_test",
530528
"//pkg/sql/logictest/tests/local-mixed-25.4:local-mixed-25_4_test",
531529
"//pkg/sql/logictest/tests/local-prepared:local-prepared_test",
532530
"//pkg/sql/logictest/tests/local-vec-off:local-vec-off_test",
@@ -613,7 +611,6 @@ ALL_TESTS = [
613611
"//pkg/sql/schemachanger/scpb:scpb_test",
614612
"//pkg/sql/schemachanger/scplan/internal/opgen:opgen_test",
615613
"//pkg/sql/schemachanger/scplan/internal/rules/current:current_test",
616-
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_3:release_25_3_test",
617614
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_4:release_25_4_test",
618615
"//pkg/sql/schemachanger/scplan/internal/scgraph:scgraph_test",
619616
"//pkg/sql/schemachanger/scplan:scplan_test",
@@ -646,7 +643,6 @@ ALL_TESTS = [
646643
"//pkg/sql/sqlitelogictest/tests/fakedist-vec-off:fakedist-vec-off_test",
647644
"//pkg/sql/sqlitelogictest/tests/fakedist:fakedist_test",
648645
"//pkg/sql/sqlitelogictest/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
649-
"//pkg/sql/sqlitelogictest/tests/local-mixed-25.3:local-mixed-25_3_test",
650646
"//pkg/sql/sqlitelogictest/tests/local-mixed-25.4:local-mixed-25_4_test",
651647
"//pkg/sql/sqlitelogictest/tests/local-prepared:local-prepared_test",
652648
"//pkg/sql/sqlitelogictest/tests/local-read-committed:local-read-committed_test",
@@ -1000,7 +996,6 @@ GO_TARGETS = [
1000996
"//pkg/ccl/logictestccl/tests/fakedist-vec-off:fakedist-vec-off_test",
1001997
"//pkg/ccl/logictestccl/tests/fakedist:fakedist_test",
1002998
"//pkg/ccl/logictestccl/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
1003-
"//pkg/ccl/logictestccl/tests/local-mixed-25.3:local-mixed-25_3_test",
1004999
"//pkg/ccl/logictestccl/tests/local-mixed-25.4:local-mixed-25_4_test",
10051000
"//pkg/ccl/logictestccl/tests/local-prepared:local-prepared_test",
10061001
"//pkg/ccl/logictestccl/tests/local-read-committed:local-read-committed_test",
@@ -2103,7 +2098,6 @@ GO_TARGETS = [
21032098
"//pkg/sql/logictest/tests/fakedist:fakedist_test",
21042099
"//pkg/sql/logictest/tests/local-leased-descriptors:local-leased-descriptors_test",
21052100
"//pkg/sql/logictest/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
2106-
"//pkg/sql/logictest/tests/local-mixed-25.3:local-mixed-25_3_test",
21072101
"//pkg/sql/logictest/tests/local-mixed-25.4:local-mixed-25_4_test",
21082102
"//pkg/sql/logictest/tests/local-prepared:local-prepared_test",
21092103
"//pkg/sql/logictest/tests/local-vec-off:local-vec-off_test",
@@ -2301,8 +2295,6 @@ GO_TARGETS = [
23012295
"//pkg/sql/schemachanger/scplan/internal/opgen:opgen_test",
23022296
"//pkg/sql/schemachanger/scplan/internal/rules/current:current",
23032297
"//pkg/sql/schemachanger/scplan/internal/rules/current:current_test",
2304-
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_3:release_25_3",
2305-
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_3:release_25_3_test",
23062298
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_4:release_25_4",
23072299
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_4:release_25_4_test",
23082300
"//pkg/sql/schemachanger/scplan/internal/rules:rules",
@@ -2383,7 +2375,6 @@ GO_TARGETS = [
23832375
"//pkg/sql/sqlitelogictest/tests/fakedist-vec-off:fakedist-vec-off_test",
23842376
"//pkg/sql/sqlitelogictest/tests/fakedist:fakedist_test",
23852377
"//pkg/sql/sqlitelogictest/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
2386-
"//pkg/sql/sqlitelogictest/tests/local-mixed-25.3:local-mixed-25_3_test",
23872378
"//pkg/sql/sqlitelogictest/tests/local-mixed-25.4:local-mixed-25_4_test",
23882379
"//pkg/sql/sqlitelogictest/tests/local-prepared:local-prepared_test",
23892380
"//pkg/sql/sqlitelogictest/tests/local-read-committed:local-read-committed_test",

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.3
933+
onlyif config local-legacy-schema-changer
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.3
937+
skipif config local-legacy-schema-changer
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.3/BUILD.bazel

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

0 commit comments

Comments
 (0)