Skip to content

Commit

Permalink
clusterversion: bump MinSupported to 24.2
Browse files Browse the repository at this point in the history 
Once we advance the version to to 25.1, we will bump again to 24.3

Epic: REL-1292
Release note: None
  • Loading branch information
@RaduBerinde
RaduBerinde committed Nov 6, 2024
1 parent 03e522a commit a9e9e6e
Show file tree
Hide file tree
Showing 62 changed files with 165 additions and 5,286 deletions.
2 changes: 1 addition & 1 deletion build/teamcity/cockroach/nightlies/sqllogic_corpus_nightly_impl.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ if [ $exit_status = 0 ]; then
fi

# Generate a corpus for all mixed version variants
for config in local-mixed-24.1; do
for config in local-mixed-24.2; do
$BAZEL_BIN/pkg/cmd/bazci/bazci_/bazci test -- --config=ci \
//pkg/sql/logictest/tests/$config/... \
--test_arg=--declarative-corpus=$ARTIFACTS_DIR/corpus-mixed \
Expand Down
12 changes: 0 additions & 12 deletions pkg/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,10 @@ ALL_TESTS = [
"//pkg/ccl/logictestccl/tests/3node-tenant-multiregion:3node-tenant-multiregion_test",
"//pkg/ccl/logictestccl/tests/3node-tenant:3node-tenant_test",
"//pkg/ccl/logictestccl/tests/5node:5node_test",
"//pkg/ccl/logictestccl/tests/cockroach-go-testserver-24.1:cockroach-go-testserver-24_1_test",
"//pkg/ccl/logictestccl/tests/fakedist-disk:fakedist-disk_test",
"//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-24.1:local-mixed-24_1_test",
"//pkg/ccl/logictestccl/tests/local-mixed-24.2:local-mixed-24_2_test",
"//pkg/ccl/logictestccl/tests/local-read-committed:local-read-committed_test",
"//pkg/ccl/logictestccl/tests/local-repeatable-read:local-repeatable-read_test",
Expand Down Expand Up @@ -481,13 +479,11 @@ 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-24.1:cockroach-go-testserver-24_1_test",
"//pkg/sql/logictest/tests/cockroach-go-testserver-24.2:cockroach-go-testserver-24_2_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-legacy-schema-changer:local-legacy-schema-changer_test",
"//pkg/sql/logictest/tests/local-mixed-24.1:local-mixed-24_1_test",
"//pkg/sql/logictest/tests/local-mixed-24.2:local-mixed-24_2_test",
"//pkg/sql/logictest/tests/local-vec-off:local-vec-off_test",
"//pkg/sql/logictest/tests/local:local_test",
Expand All @@ -505,7 +501,6 @@ ALL_TESTS = [
"//pkg/sql/opt/exec/execbuilder/tests/fakedist-vec-off:fakedist-vec-off_test",
"//pkg/sql/opt/exec/execbuilder/tests/fakedist:fakedist_test",
"//pkg/sql/opt/exec/execbuilder/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
"//pkg/sql/opt/exec/execbuilder/tests/local-mixed-24.1:local-mixed-24_1_test",
"//pkg/sql/opt/exec/execbuilder/tests/local-mixed-24.2:local-mixed-24_2_test",
"//pkg/sql/opt/exec/execbuilder/tests/local-vec-off:local-vec-off_test",
"//pkg/sql/opt/exec/execbuilder/tests/local:local_test",
Expand Down Expand Up @@ -608,7 +603,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-24.1:local-mixed-24_1_test",
"//pkg/sql/sqlitelogictest/tests/local-mixed-24.2:local-mixed-24_2_test",
"//pkg/sql/sqlitelogictest/tests/local-read-committed:local-read-committed_test",
"//pkg/sql/sqlitelogictest/tests/local-repeatable-read:local-repeatable-read_test",
Expand Down Expand Up @@ -929,12 +923,10 @@ GO_TARGETS = [
"//pkg/ccl/logictestccl/tests/3node-tenant-multiregion:3node-tenant-multiregion_test",
"//pkg/ccl/logictestccl/tests/3node-tenant:3node-tenant_test",
"//pkg/ccl/logictestccl/tests/5node:5node_test",
"//pkg/ccl/logictestccl/tests/cockroach-go-testserver-24.1:cockroach-go-testserver-24_1_test",
"//pkg/ccl/logictestccl/tests/fakedist-disk:fakedist-disk_test",
"//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-24.1:local-mixed-24_1_test",
"//pkg/ccl/logictestccl/tests/local-mixed-24.2:local-mixed-24_2_test",
"//pkg/ccl/logictestccl/tests/local-read-committed:local-read-committed_test",
"//pkg/ccl/logictestccl/tests/local-repeatable-read:local-repeatable-read_test",
Expand Down Expand Up @@ -1959,13 +1951,11 @@ 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-24.1:cockroach-go-testserver-24_1_test",
"//pkg/sql/logictest/tests/cockroach-go-testserver-24.2:cockroach-go-testserver-24_2_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-legacy-schema-changer:local-legacy-schema-changer_test",
"//pkg/sql/logictest/tests/local-mixed-24.1:local-mixed-24_1_test",
"//pkg/sql/logictest/tests/local-mixed-24.2:local-mixed-24_2_test",
"//pkg/sql/logictest/tests/local-vec-off:local-vec-off_test",
"//pkg/sql/logictest/tests/local:local_test",
Expand All @@ -1992,7 +1982,6 @@ GO_TARGETS = [
"//pkg/sql/opt/exec/execbuilder/tests/fakedist-vec-off:fakedist-vec-off_test",
"//pkg/sql/opt/exec/execbuilder/tests/fakedist:fakedist_test",
"//pkg/sql/opt/exec/execbuilder/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
"//pkg/sql/opt/exec/execbuilder/tests/local-mixed-24.1:local-mixed-24_1_test",
"//pkg/sql/opt/exec/execbuilder/tests/local-mixed-24.2:local-mixed-24_2_test",
"//pkg/sql/opt/exec/execbuilder/tests/local-vec-off:local-vec-off_test",
"//pkg/sql/opt/exec/execbuilder/tests/local:local_test",
Expand Down Expand Up @@ -2242,7 +2231,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-24.1:local-mixed-24_1_test",
"//pkg/sql/sqlitelogictest/tests/local-mixed-24.2:local-mixed-24_2_test",
"//pkg/sql/sqlitelogictest/tests/local-read-committed:local-read-committed_test",
"//pkg/sql/sqlitelogictest/tests/local-repeatable-read:local-repeatable-read_test",
Expand Down
60 changes: 0 additions & 60 deletions pkg/ccl/logictestccl/testdata/logic_test/mixed_version_pgvector
View file

This file was deleted.

2 changes: 1 addition & 1 deletion pkg/ccl/logictestccl/testdata/logic_test/triggers
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# LogicTest: !local-mixed-24.1 !local-mixed-24.2 !local-legacy-schema-changer
# LogicTest: !local-mixed-24.2 !local-legacy-schema-changer

# Include some hidden columns that won't be visible to triggers.
statement ok
Expand Down
2 changes: 0 additions & 2 deletions pkg/ccl/logictestccl/testdata/logic_test/vector
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# LogicTest: !local-mixed-24.1

statement ok
CREATE EXTENSION vector

Expand Down
7 changes: 7 additions & 0 deletions pkg/ccl/logictestccl/tests/3node-tenant/generated_test.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 0 additions & 30 deletions pkg/ccl/logictestccl/tests/cockroach-go-testserver-24.1/BUILD.bazel
View file

This file was deleted.

83 changes: 0 additions & 83 deletions pkg/ccl/logictestccl/tests/cockroach-go-testserver-24.1/generated_test.go
View file

This file was deleted.

28 changes: 0 additions & 28 deletions pkg/ccl/logictestccl/tests/local-mixed-24.1/BUILD.bazel
View file

This file was deleted.

Loading

0 comments on commit a9e9e6e

Please sign in to comment.