Skip to content

[WIP] clusterversion: bump MinSupported - with fixes #157097

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

[WIP] clusterversion: bump MinSupported - with fixes #157097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
536e21c
clusterversion: bump MinSupported from V25_2 to V25_3
celiala Nov 6, 2025
85c0bcf
logictests: remove obsolete 25.2 mixed-version test cases
celiala Nov 8, 2025
4bcd7b6
logictests: remove additional 25.2-specific test cases
celiala Nov 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions pkg/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ ALL_TESTS = [
"//pkg/ccl/logictestccl/tests/fakedist-vec-off:fakedist-vec-off_test",
"//pkg/ccl/logictestccl/tests/fakedist:fakedist_test",
"//pkg/ccl/logictestccl/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
"//pkg/ccl/logictestccl/tests/local-mixed-25.2:local-mixed-25_2_test",
"//pkg/ccl/logictestccl/tests/local-mixed-25.3:local-mixed-25_3_test",
"//pkg/ccl/logictestccl/tests/local-mixed-25.4:local-mixed-25_4_test",
"//pkg/ccl/logictestccl/tests/local-prepared:local-prepared_test",
Expand Down Expand Up @@ -518,15 +517,13 @@ ALL_TESTS = [
"//pkg/sql/logictest/logictestbase:logictestbase_test",
"//pkg/sql/logictest/tests/5node-disk:5node-disk_test",
"//pkg/sql/logictest/tests/5node:5node_test",
"//pkg/sql/logictest/tests/cockroach-go-testserver-25.2:cockroach-go-testserver-25_2_test",
"//pkg/sql/logictest/tests/cockroach-go-testserver-25.3:cockroach-go-testserver-25_3_test",
"//pkg/sql/logictest/tests/cockroach-go-testserver-25.4:cockroach-go-testserver-25_4_test",
"//pkg/sql/logictest/tests/fakedist-disk:fakedist-disk_test",
"//pkg/sql/logictest/tests/fakedist-vec-off:fakedist-vec-off_test",
"//pkg/sql/logictest/tests/fakedist:fakedist_test",
"//pkg/sql/logictest/tests/local-leased-descriptors:local-leased-descriptors_test",
"//pkg/sql/logictest/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
"//pkg/sql/logictest/tests/local-mixed-25.2:local-mixed-25_2_test",
"//pkg/sql/logictest/tests/local-mixed-25.3:local-mixed-25_3_test",
"//pkg/sql/logictest/tests/local-mixed-25.4:local-mixed-25_4_test",
"//pkg/sql/logictest/tests/local-prepared:local-prepared_test",
Expand Down Expand Up @@ -614,7 +611,6 @@ ALL_TESTS = [
"//pkg/sql/schemachanger/scpb:scpb_test",
"//pkg/sql/schemachanger/scplan/internal/opgen:opgen_test",
"//pkg/sql/schemachanger/scplan/internal/rules/current:current_test",
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_2:release_25_2_test",
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_3:release_25_3_test",
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_4:release_25_4_test",
"//pkg/sql/schemachanger/scplan/internal/scgraph:scgraph_test",
Expand Down Expand Up @@ -648,7 +644,6 @@ ALL_TESTS = [
"//pkg/sql/sqlitelogictest/tests/fakedist-vec-off:fakedist-vec-off_test",
"//pkg/sql/sqlitelogictest/tests/fakedist:fakedist_test",
"//pkg/sql/sqlitelogictest/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
"//pkg/sql/sqlitelogictest/tests/local-mixed-25.2:local-mixed-25_2_test",
"//pkg/sql/sqlitelogictest/tests/local-mixed-25.3:local-mixed-25_3_test",
"//pkg/sql/sqlitelogictest/tests/local-mixed-25.4:local-mixed-25_4_test",
"//pkg/sql/sqlitelogictest/tests/local-prepared:local-prepared_test",
Expand Down Expand Up @@ -1000,7 +995,6 @@ GO_TARGETS = [
"//pkg/ccl/logictestccl/tests/fakedist-vec-off:fakedist-vec-off_test",
"//pkg/ccl/logictestccl/tests/fakedist:fakedist_test",
"//pkg/ccl/logictestccl/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
"//pkg/ccl/logictestccl/tests/local-mixed-25.2:local-mixed-25_2_test",
"//pkg/ccl/logictestccl/tests/local-mixed-25.3:local-mixed-25_3_test",
"//pkg/ccl/logictestccl/tests/local-mixed-25.4:local-mixed-25_4_test",
"//pkg/ccl/logictestccl/tests/local-prepared:local-prepared_test",
Expand Down Expand Up @@ -2094,15 +2088,13 @@ GO_TARGETS = [
"//pkg/sql/logictest/logictestbase:logictestbase_test",
"//pkg/sql/logictest/tests/5node-disk:5node-disk_test",
"//pkg/sql/logictest/tests/5node:5node_test",
"//pkg/sql/logictest/tests/cockroach-go-testserver-25.2:cockroach-go-testserver-25_2_test",
"//pkg/sql/logictest/tests/cockroach-go-testserver-25.3:cockroach-go-testserver-25_3_test",
"//pkg/sql/logictest/tests/cockroach-go-testserver-25.4:cockroach-go-testserver-25_4_test",
"//pkg/sql/logictest/tests/fakedist-disk:fakedist-disk_test",
"//pkg/sql/logictest/tests/fakedist-vec-off:fakedist-vec-off_test",
"//pkg/sql/logictest/tests/fakedist:fakedist_test",
"//pkg/sql/logictest/tests/local-leased-descriptors:local-leased-descriptors_test",
"//pkg/sql/logictest/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
"//pkg/sql/logictest/tests/local-mixed-25.2:local-mixed-25_2_test",
"//pkg/sql/logictest/tests/local-mixed-25.3:local-mixed-25_3_test",
"//pkg/sql/logictest/tests/local-mixed-25.4:local-mixed-25_4_test",
"//pkg/sql/logictest/tests/local-prepared:local-prepared_test",
Expand Down Expand Up @@ -2301,8 +2293,6 @@ GO_TARGETS = [
"//pkg/sql/schemachanger/scplan/internal/opgen:opgen_test",
"//pkg/sql/schemachanger/scplan/internal/rules/current:current",
"//pkg/sql/schemachanger/scplan/internal/rules/current:current_test",
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_2:release_25_2",
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_2:release_25_2_test",
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_3:release_25_3",
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_3:release_25_3_test",
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_4:release_25_4",
Expand Down Expand Up @@ -2385,7 +2375,6 @@ GO_TARGETS = [
"//pkg/sql/sqlitelogictest/tests/fakedist-vec-off:fakedist-vec-off_test",
"//pkg/sql/sqlitelogictest/tests/fakedist:fakedist_test",
"//pkg/sql/sqlitelogictest/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
"//pkg/sql/sqlitelogictest/tests/local-mixed-25.2:local-mixed-25_2_test",
"//pkg/sql/sqlitelogictest/tests/local-mixed-25.3:local-mixed-25_3_test",
"//pkg/sql/sqlitelogictest/tests/local-mixed-25.4:local-mixed-25_4_test",
"//pkg/sql/sqlitelogictest/tests/local-prepared:local-prepared_test",
Expand Down
1 change: 0 additions & 1 deletion pkg/ccl/logictestccl/testdata/logic_test/redact_descriptor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ CREATE VIEW redacted_descriptors AS
# descriptor. We will skip the config that uses legacy schema changer.
skipif config local-schema-locked
skipif config local-legacy-schema-changer
skipif config local-mixed-25.2
query T
SELECT descriptor from redacted_descriptors where id = 'collate_partition'::REGCLASS;
----
Expand Down
4 changes: 2 additions & 2 deletions pkg/ccl/logictestccl/testdata/logic_test/triggers
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -929,11 +929,11 @@ statement ok
CREATE TRIGGER foo AFTER INSERT ON xy FOR EACH ROW EXECUTE FUNCTION trigger_func();

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

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

Expand Down
28 changes: 0 additions & 28 deletions pkg/ccl/logictestccl/tests/local-mixed-25.2/BUILD.bazel
View file
Open in desktop

This file was deleted.

Loading
Loading