Merge #82937

82937: roachtest: assign some tests to the multi-tenant team r=renatolabs a=knz Release note: None Co-authored-by: Raphael 'kena' Poss <[email protected]>
cockroachdb · Jun 16, 2022 · 1634866 · 1634866
2 parents 2b082dd + 1009de3
commit 1634866
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/pkg/cmd/roachtest/registry/owners.go b/pkg/cmd/roachtest/registry/owners.go
@@ -28,4 +28,5 @@ const (
 	OwnerStorage       Owner = `storage`
 	OwnerTestEng       Owner = `test-eng`
 	OwnerDevInf        Owner = `dev-inf`
+	OwnerMultiTenant   Owner = `multi-tenant`
 )
diff --git a/pkg/cmd/roachtest/tests/acceptance.go b/pkg/cmd/roachtest/tests/acceptance.go
@@ -40,11 +40,6 @@ func registerAcceptance(r registry.Registry) {
 				encryptionSupport: registry.EncryptionAlwaysDisabled,
 			},
 			{name: "gossip/locality-address", fn: runCheckLocalityIPAddress},
-			{
-				name: "multitenant",
-				skip: "https://github.com/cockroachdb/cockroach/issues/81506",
-				fn:   runAcceptanceMultitenant,
-			},
 			{name: "reset-quorum", fn: runResetQuorum, numNodes: 8},
 			{
 				name: "many-splits", fn: runManySplits,
@@ -65,6 +60,13 @@ func registerAcceptance(r registry.Registry) {
 				timeout:    30 * time.Minute,
 			},
 		},
+		registry.OwnerMultiTenant: {
+			{
+				name: "multitenant",
+				skip: "https://github.com/cockroachdb/cockroach/issues/81506",
+				fn:   runAcceptanceMultitenant,
+			},
+		},
 		registry.OwnerServer: {
 			{name: "build-info", fn: RunBuildInfo},
 			{name: "build-analyze", fn: RunBuildAnalyze},

diff --git a/pkg/cmd/roachtest/tests/multitenant_upgrade.go b/pkg/cmd/roachtest/tests/multitenant_upgrade.go
@@ -29,7 +29,7 @@ func registerMultiTenantUpgrade(r registry.Registry) {
 	r.Add(registry.TestSpec{
 		Name:              "multitenant-upgrade",
 		Cluster:           r.MakeClusterSpec(2),
-		Owner:             registry.OwnerKV,
+		Owner:             registry.OwnerMultiTenant,
 		NonReleaseBlocker: false,
 		Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
 			runMultiTenantUpgrade(ctx, t, c, *t.BuildVersion())

diff --git a/pkg/cmd/roachtest/tests/smoketest_secure.go b/pkg/cmd/roachtest/tests/smoketest_secure.go
@@ -44,7 +44,7 @@ func registerSecure(r registry.Registry) {
 	}
 	r.Add(registry.TestSpec{
 		Name:    "smoketest/secure/multitenant",
-		Owner:   registry.OwnerServer,
+		Owner:   registry.OwnerMultiTenant,
 		Cluster: r.MakeClusterSpec(2),
 		Run:     multitenantSmokeTest,
 	})