Merge #81810

craig[bot] · tbg · craig[bot] · commit 902401521dec · 2022-05-25T11:08:45.000Z
81810: roachtest: skip acceptance/multitenant r=erikgrinaker a=tbg #81506 Release note: None Co-authored-by: Tobias Grieger <tobias.b.grieger@gmail.com>
diff --git a/pkg/cmd/roachtest/tests/acceptance.go b/pkg/cmd/roachtest/tests/acceptance.go
@@ -41,9 +41,9 @@ func registerAcceptance(r registry.Registry) {
 			},
 			{name: "gossip/locality-address", fn: runCheckLocalityIPAddress},
 			{
-				name:       "multitenant",
-				minVersion: "v20.2.0", // multitenancy is introduced in this cycle
-				fn:         runAcceptanceMultitenant,
+				name: "multitenant",
+				skip: "https://github.com/cockroachdb/cockroach/issues/81506",
+				fn:   runAcceptanceMultitenant,
 			},
 			{name: "reset-quorum", fn: runResetQuorum, numNodes: 8},
 			{

Original file line number	Diff line number	Diff line change
`@@ -41,9 +41,9 @@ func registerAcceptance(r registry.Registry) {`
`41`	`41`	`},`
`42`	`42`	`{name: "gossip/locality-address", fn: runCheckLocalityIPAddress},`
`43`	`43`	`{`
`44`		`- name: "multitenant",`
`45`		`- minVersion: "v20.2.0", // multitenancy is introduced in this cycle`
`46`		`- fn: runAcceptanceMultitenant,`
	`44`	`+ name: "multitenant",`
	`45`	`+ skip: "https://github.com/cockroachdb/cockroach/issues/81506",`
	`46`	`+ fn: runAcceptanceMultitenant,`
`47`	`47`	`},`
`48`	`48`	`{name: "reset-quorum", fn: runResetQuorum, numNodes: 8},`
`49`	`49`	`{`