Skip to content

Commit 5a107b4

Browse files
celialaclaude
andcommitted
clusterversion: bump MinSupported from V25_2 to V25_3
This change updates the minimum supported cluster version from 25.2 to 25.3, removing all 25.2-specific code and infrastructure. Changes include: - Updated MinSupported constant from V25_2 to V25_3 - Renamed V25_3_* version keys with TODO_Delete_ prefix - Updated Pebble MinimumSupportedFormatVersion - Removed 25.2 bootstrap data files (4 files) - Deleted release_25_2 schema changer rules (~30 files) - Removed local-mixed-25.2 and cockroach-go-testserver-25.2 logictest configs - Updated skipif directives in ~200+ test files - Regenerated Bazel build files Part of M.4 task (quarterly version bump process). Release note (ops change): The minimum supported version for upgrades is now 25.3. Clusters running 25.2 or earlier must upgrade to 25.3 before upgrading to this version. Epic: None 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
1 parent 4b91212 commit 5a107b4

File tree

95 files changed

+255
-18418
lines changed

Some content is hidden

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

95 files changed

+255
-18418
lines changed

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",
@@ -518,15 +517,13 @@ ALL_TESTS = [
518517
"//pkg/sql/logictest/logictestbase:logictestbase_test",
519518
"//pkg/sql/logictest/tests/5node-disk:5node-disk_test",
520519
"//pkg/sql/logictest/tests/5node:5node_test",
521-
"//pkg/sql/logictest/tests/cockroach-go-testserver-25.2:cockroach-go-testserver-25_2_test",
522520
"//pkg/sql/logictest/tests/cockroach-go-testserver-25.3:cockroach-go-testserver-25_3_test",
523521
"//pkg/sql/logictest/tests/cockroach-go-testserver-25.4:cockroach-go-testserver-25_4_test",
524522
"//pkg/sql/logictest/tests/fakedist-disk:fakedist-disk_test",
525523
"//pkg/sql/logictest/tests/fakedist-vec-off:fakedist-vec-off_test",
526524
"//pkg/sql/logictest/tests/fakedist:fakedist_test",
527525
"//pkg/sql/logictest/tests/local-leased-descriptors:local-leased-descriptors_test",
528526
"//pkg/sql/logictest/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
529-
"//pkg/sql/logictest/tests/local-mixed-25.2:local-mixed-25_2_test",
530527
"//pkg/sql/logictest/tests/local-mixed-25.3:local-mixed-25_3_test",
531528
"//pkg/sql/logictest/tests/local-mixed-25.4:local-mixed-25_4_test",
532529
"//pkg/sql/logictest/tests/local-prepared:local-prepared_test",
@@ -614,7 +611,6 @@ ALL_TESTS = [
614611
"//pkg/sql/schemachanger/scpb:scpb_test",
615612
"//pkg/sql/schemachanger/scplan/internal/opgen:opgen_test",
616613
"//pkg/sql/schemachanger/scplan/internal/rules/current:current_test",
617-
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_2:release_25_2_test",
618614
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_3:release_25_3_test",
619615
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_4:release_25_4_test",
620616
"//pkg/sql/schemachanger/scplan/internal/scgraph:scgraph_test",
@@ -648,7 +644,6 @@ ALL_TESTS = [
648644
"//pkg/sql/sqlitelogictest/tests/fakedist-vec-off:fakedist-vec-off_test",
649645
"//pkg/sql/sqlitelogictest/tests/fakedist:fakedist_test",
650646
"//pkg/sql/sqlitelogictest/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
651-
"//pkg/sql/sqlitelogictest/tests/local-mixed-25.2:local-mixed-25_2_test",
652647
"//pkg/sql/sqlitelogictest/tests/local-mixed-25.3:local-mixed-25_3_test",
653648
"//pkg/sql/sqlitelogictest/tests/local-mixed-25.4:local-mixed-25_4_test",
654649
"//pkg/sql/sqlitelogictest/tests/local-prepared:local-prepared_test",
@@ -1000,7 +995,6 @@ GO_TARGETS = [
1000995
"//pkg/ccl/logictestccl/tests/fakedist-vec-off:fakedist-vec-off_test",
1001996
"//pkg/ccl/logictestccl/tests/fakedist:fakedist_test",
1002997
"//pkg/ccl/logictestccl/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
1003-
"//pkg/ccl/logictestccl/tests/local-mixed-25.2:local-mixed-25_2_test",
1004998
"//pkg/ccl/logictestccl/tests/local-mixed-25.3:local-mixed-25_3_test",
1005999
"//pkg/ccl/logictestccl/tests/local-mixed-25.4:local-mixed-25_4_test",
10061000
"//pkg/ccl/logictestccl/tests/local-prepared:local-prepared_test",
@@ -2094,15 +2088,13 @@ GO_TARGETS = [
20942088
"//pkg/sql/logictest/logictestbase:logictestbase_test",
20952089
"//pkg/sql/logictest/tests/5node-disk:5node-disk_test",
20962090
"//pkg/sql/logictest/tests/5node:5node_test",
2097-
"//pkg/sql/logictest/tests/cockroach-go-testserver-25.2:cockroach-go-testserver-25_2_test",
20982091
"//pkg/sql/logictest/tests/cockroach-go-testserver-25.3:cockroach-go-testserver-25_3_test",
20992092
"//pkg/sql/logictest/tests/cockroach-go-testserver-25.4:cockroach-go-testserver-25_4_test",
21002093
"//pkg/sql/logictest/tests/fakedist-disk:fakedist-disk_test",
21012094
"//pkg/sql/logictest/tests/fakedist-vec-off:fakedist-vec-off_test",
21022095
"//pkg/sql/logictest/tests/fakedist:fakedist_test",
21032096
"//pkg/sql/logictest/tests/local-leased-descriptors:local-leased-descriptors_test",
21042097
"//pkg/sql/logictest/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
2105-
"//pkg/sql/logictest/tests/local-mixed-25.2:local-mixed-25_2_test",
21062098
"//pkg/sql/logictest/tests/local-mixed-25.3:local-mixed-25_3_test",
21072099
"//pkg/sql/logictest/tests/local-mixed-25.4:local-mixed-25_4_test",
21082100
"//pkg/sql/logictest/tests/local-prepared:local-prepared_test",
@@ -2301,8 +2293,6 @@ GO_TARGETS = [
23012293
"//pkg/sql/schemachanger/scplan/internal/opgen:opgen_test",
23022294
"//pkg/sql/schemachanger/scplan/internal/rules/current:current",
23032295
"//pkg/sql/schemachanger/scplan/internal/rules/current:current_test",
2304-
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_2:release_25_2",
2305-
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_2:release_25_2_test",
23062296
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_3:release_25_3",
23072297
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_3:release_25_3_test",
23082298
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_4:release_25_4",
@@ -2385,7 +2375,6 @@ GO_TARGETS = [
23852375
"//pkg/sql/sqlitelogictest/tests/fakedist-vec-off:fakedist-vec-off_test",
23862376
"//pkg/sql/sqlitelogictest/tests/fakedist:fakedist_test",
23872377
"//pkg/sql/sqlitelogictest/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
2388-
"//pkg/sql/sqlitelogictest/tests/local-mixed-25.2:local-mixed-25_2_test",
23892378
"//pkg/sql/sqlitelogictest/tests/local-mixed-25.3:local-mixed-25_3_test",
23902379
"//pkg/sql/sqlitelogictest/tests/local-mixed-25.4:local-mixed-25_4_test",
23912380
"//pkg/sql/sqlitelogictest/tests/local-prepared:local-prepared_test",

pkg/ccl/logictestccl/testdata/logic_test/redact_descriptor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ CREATE VIEW redacted_descriptors AS
4747
# descriptor. We will skip the config that uses legacy schema changer.
4848
skipif config local-schema-locked
4949
skipif config local-legacy-schema-changer
50-
skipif config local-mixed-25.2
50+
skipif config
5151
query T
5252
SELECT descriptor from redacted_descriptors where id = 'collate_partition'::REGCLASS;
5353
----

pkg/ccl/logictestccl/testdata/logic_test/triggers

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

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

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

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)