Merge pull request #159937 from fqazi/blathers/backport-release-26.1-159914

release-26.1: schemachangerccl: split multi-region backup tests

Author: rafiss

pkg/BUILD.bazel

@@ -82,6 +82,7 @@ ALL_TESTS = [
     "//pkg/ccl/pgcryptoccl/pgcryptocipherccl:pgcryptocipherccl_test",
     "//pkg/ccl/pgcryptoccl:pgcryptoccl_test",
     "//pkg/ccl/schemachangerccl/sctestbackupccl:sctestbackupccl_test",
+    "//pkg/ccl/schemachangerccl/sctestbackupmrccl:sctestbackupmrccl_test",
     "//pkg/ccl/schemachangerccl:schemachangerccl_test",
     "//pkg/ccl/serverccl/adminccl:adminccl_test",
     "//pkg/ccl/serverccl/diagnosticsccl:diagnosticsccl_test",
@@ -1034,6 +1035,7 @@ GO_TARGETS = [
     "//pkg/ccl/pgcryptoccl:pgcryptoccl",
     "//pkg/ccl/pgcryptoccl:pgcryptoccl_test",
     "//pkg/ccl/schemachangerccl/sctestbackupccl:sctestbackupccl_test",
+    "//pkg/ccl/schemachangerccl/sctestbackupmrccl:sctestbackupmrccl_test",
     "//pkg/ccl/schemachangerccl:schemachangerccl",
     "//pkg/ccl/schemachangerccl:schemachangerccl_test",
     "//pkg/ccl/securityccl/fipsccl:fipsccl",

pkg/ccl/schemachangerccl/sctestbackupccl/BUILD.bazel

@@ -7,10 +7,8 @@ go_test(
     srcs = [
         "main_test.go",
         ":test_gen",  # keep
-        ":test_gen_multiregion",  # keep
     ],
     data = [
-        "//pkg/ccl/schemachangerccl:end_to_end_ccl_testdata",
         "//pkg/sql/schemachanger:end_to_end_testdata",
     ],
     exec_properties = {"test.Pool": "heavy"},
@@ -52,23 +50,3 @@ sctest_gen(
         "//pkg/gen:__pkg__",
     ],
 )
-
-sctest_gen(
-    name = "test_gen_multiregion",
-    out = "backup_multiregion_generated_test.go",
-    ccl = True,
-    new_cluster_factory = "MultiRegionTestClusterFactory{}",
-    package = "sctestbackupccl",
-    suffix = "_multiregion",
-    test_data = ["//pkg/ccl/schemachangerccl:end_to_end_ccl_testdata_definitions"],
-    tests = [
-        "BackupRollbacks",
-        "BackupRollbacksMixedVersion",
-        "BackupSuccess",
-        "BackupSuccessMixedVersion",
-    ],
-    visibility = [
-        ":__pkg__",
-        "//pkg/gen:__pkg__",
-    ],
-)

pkg/ccl/schemachangerccl/sctestbackupmrccl/BUILD.bazel

@@ -0,0 +1,50 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_test")
+load("//pkg/sql/schemachanger/sctest/sctestgen:gen.bzl", "sctest_gen")
+
+go_test(
+    name = "sctestbackupmrccl_test",
+    size = "enormous",
+    srcs = [
+        "main_test.go",
+        ":test_gen_multiregion",  # keep
+    ],
+    data = [
+        "//pkg/ccl/schemachangerccl:end_to_end_ccl_testdata",
+    ],
+    exec_properties = {"test.Pool": "heavy"},
+    shard_count = 48,
+    tags = ["cpu:4"],
+    deps = [
+        "//pkg/ccl",
+        "//pkg/ccl/schemachangerccl",
+        "//pkg/security/securityassets",
+        "//pkg/security/securitytest",
+        "//pkg/server",
+        "//pkg/sql/schemachanger/sctest",  # keep
+        "//pkg/testutils/serverutils",
+        "//pkg/testutils/testcluster",
+        "//pkg/util/leaktest",  # keep
+        "//pkg/util/log",  # keep
+        "//pkg/util/randutil",
+    ],
+)
+
+sctest_gen(
+    name = "test_gen_multiregion",
+    out = "backup_multiregion_generated_test.go",
+    ccl = True,
+    new_cluster_factory = "MultiRegionTestClusterFactory{}",
+    package = "sctestbackupmrccl",
+    suffix = "_multiregion",
+    test_data = ["//pkg/ccl/schemachangerccl:end_to_end_ccl_testdata_definitions"],
+    tests = [
+        "BackupRollbacks",
+        "BackupRollbacksMixedVersion",
+        "BackupSuccess",
+        "BackupSuccessMixedVersion",
+    ],
+    visibility = [
+        ":__pkg__",
+        "//pkg/gen:__pkg__",
+    ],
+)

…ccl/backup_multiregion_generated_test.go …ccl/backup_multiregion_generated_test.gopkg/ccl/schemachangerccl/sctestbackupccl/backup_multiregion_generated_test.go renamed to pkg/ccl/schemachangerccl/sctestbackupmrccl/backup_multiregion_generated_test.go pkg/ccl/schemachangerccl/sctestbackupccl/backup_multiregion_generated_test.go renamed to pkg/ccl/schemachangerccl/sctestbackupmrccl/backup_multiregion_generated_test.go

@@ -0,0 +1,39 @@
+// Copyright 2025 The Cockroach Authors.
+//
+// Use of this software is governed by the CockroachDB Software License
+// included in the /LICENSE file.
+
+package sctestbackupmrccl
+
+import (
+	"os"
+	"testing"
+
+	"github.com/cockroachdb/cockroach/pkg/ccl"
+	"github.com/cockroachdb/cockroach/pkg/ccl/schemachangerccl"
+	"github.com/cockroachdb/cockroach/pkg/security/securityassets"
+	"github.com/cockroachdb/cockroach/pkg/security/securitytest"
+	"github.com/cockroachdb/cockroach/pkg/server"
+	"github.com/cockroachdb/cockroach/pkg/sql/schemachanger/sctest"
+	"github.com/cockroachdb/cockroach/pkg/testutils/serverutils"
+	"github.com/cockroachdb/cockroach/pkg/testutils/testcluster"
+	"github.com/cockroachdb/cockroach/pkg/util/randutil"
+)
+
+func TestMain(m *testing.M) {
+	defer ccl.TestingEnableEnterprise()()
+	securityassets.SetLoader(securitytest.EmbeddedAssets)
+	randutil.SeedForTests()
+	serverutils.InitTestClusterFactory(testcluster.TestClusterFactory)
+	serverutils.InitTestServerFactory(server.TestServerFactory)
+	os.Exit(m.Run())
+}
+
+// MultiRegionTestClusterFactory is an alias for the type in the
+// schemachangerccl package, exposed here so that tests in this package can
+// easily use it.
+type MultiRegionTestClusterFactory = schemachangerccl.MultiRegionTestClusterFactory
+
+var _ sctest.TestServerFactory = MultiRegionTestClusterFactory{}
+
+//go:generate ../../../util/leaktest/add-leaktest.sh *_test.go

pkg/ccl/schemachangerccl/sctestbackupmrccl/main_test.go

@@ -2,7 +2,7 @@
 
 SCHEMACHANGER_SRCS = [
     "//pkg/ccl/schemachangerccl/sctestbackupccl:backup_base_generated_test.go",
-    "//pkg/ccl/schemachangerccl/sctestbackupccl:backup_multiregion_generated_test.go",
+    "//pkg/ccl/schemachangerccl/sctestbackupmrccl:backup_multiregion_generated_test.go",
     "//pkg/ccl/schemachangerccl:ccl_generated_test.go",
     "//pkg/sql/schemachanger/rel/internal/comparetest:testattr_string.go",
     "//pkg/sql/schemachanger/rel/internal/cyclegraphtest:testattr_string.go",