Commit 18328ee
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: None1 parent f7a19d8 commit 18328ee
File tree
39 files changed
+32
-4721
lines changed- pkg
- ccl/logictestccl
- testdata/logic_test
- tests
- local-mixed-25.3
- local-mixed-25.4
- sql
- logictest
- logictestbase
- testdata/logic_test
- tests
- cockroach-go-testserver-25.3
- cockroach-go-testserver-25.4
- local-leased-descriptors
- local-mixed-25.3
- local-mixed-25.4
- sqlitelogictest/tests
- local-mixed-25.3
- local-mixed-25.4
- storage
- upgrade/upgrades
39 files changed
+32
-4721
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
60 | 60 | | |
61 | 61 | | |
62 | 62 | | |
63 | | - | |
64 | 63 | | |
65 | 64 | | |
66 | 65 | | |
| |||
526 | 525 | | |
527 | 526 | | |
528 | 527 | | |
529 | | - | |
530 | 528 | | |
531 | 529 | | |
532 | 530 | | |
| |||
613 | 611 | | |
614 | 612 | | |
615 | 613 | | |
616 | | - | |
617 | 614 | | |
618 | 615 | | |
619 | 616 | | |
| |||
646 | 643 | | |
647 | 644 | | |
648 | 645 | | |
649 | | - | |
650 | 646 | | |
651 | 647 | | |
652 | 648 | | |
| |||
1000 | 996 | | |
1001 | 997 | | |
1002 | 998 | | |
1003 | | - | |
1004 | 999 | | |
1005 | 1000 | | |
1006 | 1001 | | |
| |||
2103 | 2098 | | |
2104 | 2099 | | |
2105 | 2100 | | |
2106 | | - | |
2107 | 2101 | | |
2108 | 2102 | | |
2109 | 2103 | | |
| |||
2301 | 2295 | | |
2302 | 2296 | | |
2303 | 2297 | | |
2304 | | - | |
2305 | | - | |
2306 | 2298 | | |
2307 | 2299 | | |
2308 | 2300 | | |
| |||
2383 | 2375 | | |
2384 | 2376 | | |
2385 | 2377 | | |
2386 | | - | |
2387 | 2378 | | |
2388 | 2379 | | |
2389 | 2380 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
930 | 930 | | |
931 | 931 | | |
932 | 932 | | |
933 | | - | |
| 933 | + | |
934 | 934 | | |
935 | 935 | | |
936 | 936 | | |
937 | | - | |
| 937 | + | |
938 | 938 | | |
939 | 939 | | |
940 | 940 | | |
| |||
This file was deleted.
0 commit comments