Skip to content

Commit 66d3555

Browse files
committed
logictest: remove cockroach-go-testserver-25.3 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 cockroach-go-testserver-25.3 configuration and related mixed-version tests are no longer needed: - Clusters can no longer start below v25.4 (MinSupported) - Mixed-version tests that check for v25.4 features are now obsolete since all clusters start at v25.4 or higher This commit: - Removes the cockroach-go-testserver-25.3 configuration from logictestbase.go - Deletes the cockroach-go-testserver-25.3 test directory - Deletes obsolete mixed-version test files: - mixed_version_ltree: Tested that LTREE is only available after upgrading to 25.4 - mixed_version_partial_stats: Tested partial stats availability after upgrade to 25.4 - Regenerates Bazel BUILD files via `./dev gen bazel` Following the pattern from reference PR #157767, which removed cockroach-go-testserver-25.2 when MinSupported was bumped from v25.2 to v25.3. Release note: None
1 parent b2d9efa commit 66d3555

File tree

8 files changed

+2
-275
lines changed

8 files changed

+2
-275
lines changed

pkg/BUILD.bazel

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,6 @@ ALL_TESTS = [
518518
"//pkg/sql/logictest/logictestbase:logictestbase_test",
519519
"//pkg/sql/logictest/tests/5node-disk:5node-disk_test",
520520
"//pkg/sql/logictest/tests/5node:5node_test",
521-
"//pkg/sql/logictest/tests/cockroach-go-testserver-25.3:cockroach-go-testserver-25_3_test",
522521
"//pkg/sql/logictest/tests/cockroach-go-testserver-25.4:cockroach-go-testserver-25_4_test",
523522
"//pkg/sql/logictest/tests/fakedist-disk:fakedist-disk_test",
524523
"//pkg/sql/logictest/tests/fakedist-vec-off:fakedist-vec-off_test",
@@ -2091,7 +2090,6 @@ GO_TARGETS = [
20912090
"//pkg/sql/logictest/logictestbase:logictestbase_test",
20922091
"//pkg/sql/logictest/tests/5node-disk:5node-disk_test",
20932092
"//pkg/sql/logictest/tests/5node:5node_test",
2094-
"//pkg/sql/logictest/tests/cockroach-go-testserver-25.3:cockroach-go-testserver-25_3_test",
20952093
"//pkg/sql/logictest/tests/cockroach-go-testserver-25.4:cockroach-go-testserver-25_4_test",
20962094
"//pkg/sql/logictest/tests/fakedist-disk:fakedist-disk_test",
20972095
"//pkg/sql/logictest/tests/fakedist-vec-off:fakedist-vec-off_test",

pkg/sql/logictest/logictestbase/logictestbase.go

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -508,14 +508,6 @@ var LogicTestConfigs = []TestClusterConfig{
508508
DisableUpgrade: true,
509509
DeclarativeCorpusCollection: true,
510510
},
511-
{
512-
// This config runs a cluster with 3 nodes, with a separate process per
513-
// node. The nodes initially start on v25.3.
514-
Name: "cockroach-go-testserver-25.3",
515-
UseCockroachGoTestserver: true,
516-
BootstrapVersion: clusterversion.V25_3,
517-
NumNodes: 3,
518-
},
519511
{
520512
Name: "local-leased-descriptors",
521513
NumNodes: 1,
@@ -656,7 +648,6 @@ var DefaultConfigSets = map[string]ConfigSet{
656648

657649
// Special alias for all testserver configs (for mixed-version testing).
658650
"cockroach-go-testserver-configs": makeConfigSet(
659-
"cockroach-go-testserver-25.3",
660651
"cockroach-go-testserver-25.4",
661652
),
662653

pkg/sql/logictest/testdata/logic_test/mixed_version_ltree

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

pkg/sql/logictest/testdata/logic_test/mixed_version_partial_stats

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

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

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

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

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

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

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/sql/logictest/tests/local-leased-descriptors/generated_test.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)