Merge #147634

147634: clusterversion, *: bump MinSupported from v25.1 to v25.2 r=iskettaneh a=iskettaneh

Bump MinSupported from v25.1 to v25.2. See individual commits for details.

Epic: REL-2848

Release note: None

Co-authored-by: Ibrahim Kettaneh <[email protected]>

Author: craig[bot]

build/teamcity/cockroach/nightlies/sqllogic_corpus_nightly_impl.sh

@@ -81,7 +81,7 @@ if [ $exit_status = 0 ]; then
 fi
 
 # Generate a corpus for all mixed version variants
-for config in local-mixed-25.1 local-mixed-25.2; do
+for config in local-mixed-25.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 \

pkg/BUILD.bazel

@@ -59,7 +59,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.1:local-mixed-25_1_test",
     "//pkg/ccl/logictestccl/tests/local-mixed-25.2:local-mixed-25_2_test",
     "//pkg/ccl/logictestccl/tests/local-read-committed:local-read-committed_test",
     "//pkg/ccl/logictestccl/tests/local-repeatable-read:local-repeatable-read_test",
@@ -506,7 +505,6 @@ ALL_TESTS = [
     "//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-25.1:local-mixed-25_1_test",
     "//pkg/sql/logictest/tests/local-mixed-25.2:local-mixed-25_2_test",
     "//pkg/sql/logictest/tests/local-schema-locked:local-schema-locked_test",
     "//pkg/sql/logictest/tests/local-vec-off:local-vec-off_test",
@@ -525,7 +523,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-25.1:local-mixed-25_1_test",
     "//pkg/sql/opt/exec/execbuilder/tests/local-mixed-25.2:local-mixed-25_2_test",
     "//pkg/sql/opt/exec/execbuilder/tests/local-schema-locked:local-schema-locked_test",
     "//pkg/sql/opt/exec/execbuilder/tests/local-vec-off:local-vec-off_test",
@@ -599,7 +596,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_1:release_25_1_test",
     "//pkg/sql/schemachanger/scplan/internal/rules/release_25_2:release_25_2_test",
     "//pkg/sql/schemachanger/scplan/internal/scgraph:scgraph_test",
     "//pkg/sql/schemachanger/scplan:scplan_test",
@@ -631,7 +627,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.1:local-mixed-25_1_test",
     "//pkg/sql/sqlitelogictest/tests/local-mixed-25.2:local-mixed-25_2_test",
     "//pkg/sql/sqlitelogictest/tests/local-read-committed:local-read-committed_test",
     "//pkg/sql/sqlitelogictest/tests/local-repeatable-read:local-repeatable-read_test",
@@ -964,7 +959,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.1:local-mixed-25_1_test",
     "//pkg/ccl/logictestccl/tests/local-mixed-25.2:local-mixed-25_2_test",
     "//pkg/ccl/logictestccl/tests/local-read-committed:local-read-committed_test",
     "//pkg/ccl/logictestccl/tests/local-repeatable-read:local-repeatable-read_test",
@@ -2033,7 +2027,6 @@ GO_TARGETS = [
     "//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-25.1:local-mixed-25_1_test",
     "//pkg/sql/logictest/tests/local-mixed-25.2:local-mixed-25_2_test",
     "//pkg/sql/logictest/tests/local-schema-locked:local-schema-locked_test",
     "//pkg/sql/logictest/tests/local-vec-off:local-vec-off_test",
@@ -2061,7 +2054,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-25.1:local-mixed-25_1_test",
     "//pkg/sql/opt/exec/execbuilder/tests/local-mixed-25.2:local-mixed-25_2_test",
     "//pkg/sql/opt/exec/execbuilder/tests/local-schema-locked:local-schema-locked_test",
     "//pkg/sql/opt/exec/execbuilder/tests/local-vec-off:local-vec-off_test",
@@ -2237,8 +2229,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_1:release_25_1",
-    "//pkg/sql/schemachanger/scplan/internal/rules/release_25_1:release_25_1_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:rules",
@@ -2315,7 +2305,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.1:local-mixed-25_1_test",
     "//pkg/sql/sqlitelogictest/tests/local-mixed-25.2:local-mixed-25_2_test",
     "//pkg/sql/sqlitelogictest/tests/local-read-committed:local-read-committed_test",
     "//pkg/sql/sqlitelogictest/tests/local-repeatable-read:local-repeatable-read_test",

pkg/backup/backupdest/BUILD.bazel

@@ -56,7 +56,6 @@ go_test(
         "//pkg/ccl",
         "//pkg/cloud",
         "//pkg/cloud/impl:cloudimpl",
-        "//pkg/clusterversion",
         "//pkg/jobs/jobspb",
         "//pkg/security/securityassets",
         "//pkg/security/securitytest",

pkg/backup/backupdest/backup_destination_test.go

@@ -21,10 +21,8 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/base"
 	"github.com/cockroachdb/cockroach/pkg/cloud"
 	_ "github.com/cockroachdb/cockroach/pkg/cloud/impl" // register cloud storage providers
-	"github.com/cockroachdb/cockroach/pkg/clusterversion"
 	"github.com/cockroachdb/cockroach/pkg/jobs/jobspb"
 	"github.com/cockroachdb/cockroach/pkg/security/username"
-	"github.com/cockroachdb/cockroach/pkg/server"
 	"github.com/cockroachdb/cockroach/pkg/sql"
 	"github.com/cockroachdb/cockroach/pkg/util/hlc"
 	"github.com/cockroachdb/cockroach/pkg/util/leaktest"
@@ -399,118 +397,4 @@ func TestBackupRestoreResolveDestination(t *testing.T) {
 	}
 }
 
-func TestMixedVersionIncrementalSuffixChains(t *testing.T) {
-	defer leaktest.AfterTest(t)()
-	defer log.Scope(t).Close(t)
-
-	args := base.TestServerArgs{
-		DefaultTestTenant: base.TestControlsTenantsExplicitly,
-	}
-	args.Knobs.Server = &server.TestingKnobs{
-		ClusterVersionOverride:         clusterversion.V25_1.Version(),
-		DisableAutomaticVersionUpgrade: make(chan struct{}),
-	}
-	_, db, tmpdir, cleanup := backuptestutils.StartBackupRestoreTestCluster(
-		t, backuptestutils.SingleNode, backuptestutils.WithParams(base.TestClusterArgs{
-			ServerArgs: args,
-		}),
-	)
-	defer cleanup()
-	fmt.Println(tmpdir)
-
-	db.Exec(t, "CREATE TABLE foo (a int)")
-	db.Exec(t, "BACKUP INTO 'nodelocal://1/backup'")
-
-	db.Exec(t, "INSERT INTO foo VALUES (1)")
-	// Round to nearest millisecond timestamp to avoid precision shenanigans
-	// between MacOS and Unix.
-	timeBeforeUpgrade := hlc.Timestamp{WallTime: time.Now().UnixNano() / 1e3 * 1e3}
-	db.Exec(
-		t,
-		fmt.Sprintf(
-			"BACKUP INTO LATEST IN 'nodelocal://1/backup' AS OF SYSTEM TIME '%s'",
-			timeBeforeUpgrade.AsOfSystemTime(),
-		),
-	)
-
-	backups := db.QueryStr(
-		t,
-		"SELECT DISTINCT (start_time, end_time) FROM [SHOW BACKUP FROM LATEST IN 'nodelocal://1/backup']",
-	)
-	require.Len(t, backups, 2)
-
-	pathBeforeIncSuffixFormat := backuputils.JoinURLPath(
-		"/"+backupbase.DefaultIncrementalsSubdir,
-		backupbase.DateBasedIntoFolderName,
-		backupbase.DateBasedIncFolderName,
-	)
-	var path string
-	db.QueryRow(
-		t,
-		`SELECT path FROM [SHOW BACKUP FILES FROM LATEST IN 'nodelocal://1/backup']
-		WHERE backup_type = 'incremental' LIMIT 1`,
-	).Scan(&path)
-	// Before 25.2, incremental folder names do not contain the suffix, so the
-	// next character after the DateBasedIncFolderName should be the end of the
-	// folder.
-	require.Equal(t, byte('/'), path[len(pathBeforeIncSuffixFormat)])
-
-	db.Exec(t, fmt.Sprintf("SET CLUSTER SETTING version = '%s'", clusterversion.V25_2.Version()))
-
-	db.Exec(t, "INSERT INTO foo VALUES (2)")
-	timeAfterUpgrade := hlc.Timestamp{WallTime: time.Now().UnixNano() / 1e3 * 1e3}
-	db.Exec(
-		t,
-		fmt.Sprintf(
-			"BACKUP INTO LATEST IN 'nodelocal://1/backup' AS OF SYSTEM TIME '%s'",
-			timeAfterUpgrade.AsOfSystemTime(),
-		),
-	)
-
-	db.QueryRow(
-		t,
-		`SELECT path FROM [SHOW BACKUP FILES FROM LATEST IN 'nodelocal://1/backup']
-		WHERE backup_type = 'incremental' ORDER BY PATH DESC LIMIT 1`,
-	).Scan(&path)
-	// Before 25.2, incremental folder names do not contain the suffix, so the
-	// next character after the DateBasedIncFolderName should not be the end of
-	// the directory.
-	require.NotEqual(t, byte('/'), path[len(pathBeforeIncSuffixFormat)])
-
-	db.Exec(t, "INSERT INTO foo VALUES (3)")
-	db.Exec(t, "BACKUP INTO LATEST IN 'nodelocal://1/backup'")
-	backups = db.QueryStr(
-		t,
-		"SELECT DISTINCT (start_time, end_time) FROM [SHOW BACKUP FROM LATEST IN 'nodelocal://1/backup']",
-	)
-	require.Len(t, backups, 4)
-
-	db.Exec(t, "DROP TABLE foo")
-	db.Exec(
-		t,
-		fmt.Sprintf(
-			"RESTORE TABLE foo FROM LATEST IN 'nodelocal://1/backup' AS OF SYSTEM TIME '%s'",
-			timeBeforeUpgrade.AsOfSystemTime(),
-		),
-	)
-	rows := db.QueryStr(t, "SELECT a FROM foo")
-	require.Len(t, rows, 1)
-
-	db.Exec(t, "DROP TABLE foo")
-	db.Exec(
-		t,
-		fmt.Sprintf(
-			"RESTORE TABLE foo FROM LATEST IN 'nodelocal://1/backup' AS OF SYSTEM TIME '%s'",
-			timeAfterUpgrade.AsOfSystemTime(),
-		),
-	)
-	rows = db.QueryStr(t, "SELECT a FROM foo")
-	require.Len(t, rows, 2)
-
-	db.Exec(t, "DROP TABLE foo")
-	db.Exec(t, "RESTORE TABLE foo FROM LATEST IN 'nodelocal://1/backup'")
-	rows = db.QueryStr(t, "SELECT a FROM foo")
-	require.Len(t, rows, 3)
-}
-
 // TODO(pbardea): Add tests for resolveBackupCollection.

pkg/ccl/logictestccl/testdata/logic_test/plpgsql_srf

@@ -1,5 +1,3 @@
-# LogicTest: !local-mixed-25.1
-
 statement ok
 CREATE TABLE xy (x INT, y INT);
 INSERT INTO xy VALUES (1, 2), (3, 4), (5, 6);