Skip to content

Commit d004431

Browse files
committed
logictest: clean up mixed-version tests for MinSupported bump
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, tests that use the cockroach-go-testserver predecessor binary configuration need cleanup: Files with ONLY cockroach-go-testserver-25.2 are removed as they test version-gating specific to a version below MinSupported: - mixed_version_char: CHAR type version gating - mixed_version_citext: CITEXT type version gating - vector_index_mixed: Vector index version gating Files with BOTH 25.2 and 25.3 testservers are updated to remove the 25.2 reference since it's below MinSupported: - mixed_version_ltree: Tests ltree type availability after upgrade - mixed_version_partial_stats: Tests partial statistics with WHERE clause Also updates the M.4 runbook with guidance for handling test files: - Guidance 1: Remove `onlyif config local-mixed-25.2` directives - Guidance 2: Remove files with only old testserver, update files with multiple testservers Part of #147634 (reference PR for this quarterly task). Release note: None Epic: None
1 parent b591b58 commit d004431

File tree

8 files changed

+822
-197
lines changed

8 files changed

+822
-197
lines changed

pkg/clusterversion/CLAUDE.md

Lines changed: 819 additions & 4 deletions
Large diffs are not rendered by default.

pkg/sql/logictest/testdata/logic_test/mixed_version_char

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

pkg/sql/logictest/testdata/logic_test/mixed_version_citext

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

pkg/sql/logictest/testdata/logic_test/mixed_version_ltree

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# LogicTest: cockroach-go-testserver-25.2 cockroach-go-testserver-25.3
1+
# LogicTest: cockroach-go-testserver-25.3
22

33
# Sanity check that LTREE type is only allowed to be used once the cluster is
44
# upgraded to 25.4.

pkg/sql/logictest/testdata/logic_test/mixed_version_partial_stats

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# LogicTest: cockroach-go-testserver-25.2 cockroach-go-testserver-25.3
1+
# LogicTest: cockroach-go-testserver-25.3
22

33
# Sanity check that partial stats with a WHERE clause can only be collected once
44
# the cluster is upgraded to 25.4.

pkg/sql/logictest/testdata/logic_test/vector_index_mixed

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

pkg/sql/logictest/tests/cockroach-go-testserver-25.2/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ go_test(
1111
"//pkg/sql/logictest:testdata", # keep
1212
],
1313
exec_properties = {"test.Pool": "heavy"},
14-
shard_count = 12,
14+
shard_count = 7,
1515
tags = ["cpu:3"],
1616
deps = [
1717
"//pkg/base",

pkg/sql/logictest/tests/cockroach-go-testserver-25.2/generated_test.go

Lines changed: 0 additions & 35 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)