Skip to content

Commit 70e9742

Browse files
committed
logictest: skip mixed_version_stats in 24.3 version
Recently merged commit jumped the gun on merging a change that is incompatible with 24.3. We haven't yet removed `cockroach-go-testserver-24.3` config so we skip it for now for the mixed version stats test (the config isn't valid anymore but will be removed some time soon). Release note: None
1 parent c4638a9 commit 70e9742

File tree

4 files changed

+4
-9
lines changed

4 files changed

+4
-9
lines changed

pkg/sql/logictest/logictestbase/logictestbase.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -649,6 +649,8 @@ var DefaultConfigSets = map[string]ConfigSet{
649649

650650
// Special alias for all testserver configs (for mixed-version testing).
651651
"cockroach-go-testserver-configs": makeConfigSet(
652+
// TODO(yuzefovich): when removing 24.3 version from here, ensure to
653+
// use the alias in mixed_version_stats.
652654
"cockroach-go-testserver-24.3",
653655
"cockroach-go-testserver-25.1",
654656
),

pkg/sql/logictest/testdata/logic_test/mixed_version_stats

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

33
# This is a regression test for #137386 which verifies the hyperloglog library
44
# upgrade for the table stats. We want such a distributed table stats collection

pkg/sql/logictest/tests/cockroach-go-testserver-24.3/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 = 11,
14+
shard_count = 10,
1515
tags = ["cpu:3"],
1616
deps = [
1717
"//pkg/base",

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

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

0 commit comments

Comments
 (0)