roachtest: allow local execution of tests that need gs fixtures

yuzefovich · yuzefovich · commit 6659d18d79e8 · 2023-08-17T19:47:31.000-07:00
We recently (in a2ba442) skipped running some tests that need gs fixtures when ran not on gce cloud. However, I think it should be ok to run these tests locally too. Epic: None Release note: None
diff --git a/pkg/cmd/roachtest/tests/backup.go b/pkg/cmd/roachtest/tests/backup.go
@@ -895,7 +895,7 @@ func registerBackup(r registry.Registry) {
 		Leases:            registry.MetamorphicLeases,
 		EncryptionSupport: registry.EncryptionMetamorphic,
 		Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
-			if c.Spec().Cloud != spec.GCE {
+			if c.Spec().Cloud != spec.GCE && !c.IsLocal() {
 				t.Skip("uses gs://cockroach-fixtures; see https://github.com/cockroachdb/cockroach/issues/105968")
 			}
 			runBackupMVCCRangeTombstones(ctx, t, c, mvccRangeTombstoneConfig{})
diff --git a/pkg/cmd/roachtest/tests/copy.go b/pkg/cmd/roachtest/tests/copy.go
@@ -185,7 +185,7 @@ func registerCopy(r registry.Registry) {
 			Cluster: r.MakeClusterSpec(tc.nodes),
 			Leases:  registry.MetamorphicLeases,
 			Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
-				if c.Spec().Cloud != spec.GCE {
+				if c.Spec().Cloud != spec.GCE && !c.IsLocal() {
 					t.Skip("uses gs://cockroach-fixtures; see https://github.com/cockroachdb/cockroach/issues/105968")
 				}
 				runCopy(ctx, t, c, tc.rows, tc.txn)
diff --git a/pkg/cmd/roachtest/tests/import.go b/pkg/cmd/roachtest/tests/import.go
@@ -90,7 +90,7 @@ func registerImportNodeShutdown(r registry.Registry) {
 		Cluster: r.MakeClusterSpec(4),
 		Leases:  registry.MetamorphicLeases,
 		Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
-			if c.Spec().Cloud != spec.GCE {
+			if c.Spec().Cloud != spec.GCE && !c.IsLocal() {
 				t.Skip("uses gs://cockroach-fixtures; see https://github.com/cockroachdb/cockroach/issues/105968")
 			}
 			c.Put(ctx, t.Cockroach(), "./cockroach")
@@ -108,7 +108,7 @@ func registerImportNodeShutdown(r registry.Registry) {
 		Cluster: r.MakeClusterSpec(4),
 		Leases:  registry.MetamorphicLeases,
 		Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
-			if c.Spec().Cloud != spec.GCE {
+			if c.Spec().Cloud != spec.GCE && !c.IsLocal() {
 				t.Skip("uses gs://cockroach-fixtures; see https://github.com/cockroachdb/cockroach/issues/105968")
 			}
 			c.Put(ctx, t.Cockroach(), "./cockroach")
@@ -225,7 +225,7 @@ func registerImportTPCH(r registry.Registry) {
 			EncryptionSupport: registry.EncryptionMetamorphic,
 			Leases:            registry.MetamorphicLeases,
 			Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
-				if c.Spec().Cloud != spec.GCE {
+				if c.Spec().Cloud != spec.GCE && !c.IsLocal() {
 					t.Skip("uses gs://cockroach-fixtures; see https://github.com/cockroachdb/cockroach/issues/105968")
 				}
 				tick, perfBuf := initBulkJobPerfArtifacts(t.Name(), item.timeout)
diff --git a/pkg/cmd/roachtest/tests/import_cancellation.go b/pkg/cmd/roachtest/tests/import_cancellation.go
@@ -37,7 +37,7 @@ func registerImportCancellation(r registry.Registry) {
 		Cluster:   r.MakeClusterSpec(6, spec.CPU(32)),
 		Leases:    registry.MetamorphicLeases,
 		Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
-			if c.Spec().Cloud != spec.GCE {
+			if c.Spec().Cloud != spec.GCE && !c.IsLocal() {
 				t.Skip("uses gs://cockroach-fixtures; see https://github.com/cockroachdb/cockroach/issues/105968")
 			}
 			runImportCancellation(ctx, t, c)
diff --git a/pkg/cmd/roachtest/tests/mixed_version_backup.go b/pkg/cmd/roachtest/tests/mixed_version_backup.go
@@ -2096,7 +2096,7 @@ func registerBackupMixedVersion(r registry.Registry) {
 		EncryptionSupport: registry.EncryptionMetamorphic,
 		RequiresLicense:   true,
 		Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
-			if c.Spec().Cloud != spec.GCE {
+			if c.Spec().Cloud != spec.GCE && !c.IsLocal() {
 				t.Skip("uses gs://cockroachdb-backup-testing; see https://github.com/cockroachdb/cockroach/issues/105968")
 			}
 
diff --git a/pkg/cmd/roachtest/tests/mixed_version_decl_schemachange_compat.go b/pkg/cmd/roachtest/tests/mixed_version_decl_schemachange_compat.go
@@ -32,7 +32,7 @@ func registerDeclSchemaChangeCompatMixedVersions(r registry.Registry) {
 		Owner:   registry.OwnerSQLFoundations,
 		Cluster: r.MakeClusterSpec(1),
 		Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
-			if c.Spec().Cloud != spec.GCE {
+			if c.Spec().Cloud != spec.GCE && !c.IsLocal() {
 				t.Skip("uses gs://cockroach-corpus; see https://github.com/cockroachdb/cockroach/issues/105968")
 			}
 			runDeclSchemaChangeCompatMixedVersions(ctx, t, c, t.BuildVersion())
diff --git a/pkg/cmd/roachtest/tests/schemachange.go b/pkg/cmd/roachtest/tests/schemachange.go
@@ -34,7 +34,7 @@ func registerSchemaChangeDuringKV(r registry.Registry) {
 		Cluster: r.MakeClusterSpec(5),
 		Leases:  registry.MetamorphicLeases,
 		Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
-			if c.Spec().Cloud != spec.GCE {
+			if c.Spec().Cloud != spec.GCE && !c.IsLocal() {
 				t.Skip("uses gs://cockroach-fixtures; see https://github.com/cockroachdb/cockroach/issues/105968")
 			}
 			const fixturePath = `gs://cockroach-fixtures/workload/tpch/scalefactor=10/backup?AUTH=implicit`
diff --git a/pkg/cmd/roachtest/tests/sqlsmith.go b/pkg/cmd/roachtest/tests/sqlsmith.go
@@ -317,7 +317,7 @@ WITH into_db = 'defaultdb', unsafe_restore_incompatible_version;
 			// NB: sqlsmith failures should never block a release.
 			NonReleaseBlocker: true,
 			Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
-				if c.Spec().Cloud != spec.GCE {
+				if c.Spec().Cloud != spec.GCE && !c.IsLocal() {
 					t.Skip("uses gs://cockroach-fixtures; see https://github.com/cockroachdb/cockroach/issues/105968")
 				}
 				runSQLSmith(ctx, t, c, setup, setting)
diff --git a/pkg/cmd/roachtest/tests/tpc_utils.go b/pkg/cmd/roachtest/tests/tpc_utils.go
@@ -44,7 +44,7 @@ func loadTPCHDataset(
 	disableMergeQueue bool,
 	secure bool,
 ) (retErr error) {
-	if c.Spec().Cloud != spec.GCE {
+	if c.Spec().Cloud != spec.GCE && !c.IsLocal() {
 		t.Skip("uses gs://cockroach-fixtures; see https://github.com/cockroachdb/cockroach/issues/105968")
 	}
 
diff --git a/pkg/cmd/roachtest/tests/tpcdsvec.go b/pkg/cmd/roachtest/tests/tpcdsvec.go
@@ -191,7 +191,7 @@ WITH unsafe_restore_incompatible_version;
 		Benchmark: true,
 		Cluster:   r.MakeClusterSpec(3),
 		Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
-			if c.Spec().Cloud != spec.GCE {
+			if c.Spec().Cloud != spec.GCE && !c.IsLocal() {
 				t.Skip("uses gs://cockroach-fixtures; see https://github.com/cockroachdb/cockroach/issues/105968")
 			}
 			runTPCDSVec(ctx, t, c)

Original file line number	Diff line number	Diff line change
`@@ -895,7 +895,7 @@ func registerBackup(r registry.Registry) {`
`895`	`895`	`Leases: registry.MetamorphicLeases,`
`896`	`896`	`EncryptionSupport: registry.EncryptionMetamorphic,`
`897`	`897`	`Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {`
`898`		`- if c.Spec().Cloud != spec.GCE {`
	`898`	`+ if c.Spec().Cloud != spec.GCE && !c.IsLocal() {`
`899`	`899`	`t.Skip("uses gs://cockroach-fixtures; see https://github.com/cockroachdb/cockroach/issues/105968")`
`900`	`900`	`}`
`901`	`901`	`runBackupMVCCRangeTombstones(ctx, t, c, mvccRangeTombstoneConfig{})`
Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ func registerCopy(r registry.Registry) {`
`185`	`185`	`Cluster: r.MakeClusterSpec(tc.nodes),`
`186`	`186`	`Leases: registry.MetamorphicLeases,`
`187`	`187`	`Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {`
`188`		`- if c.Spec().Cloud != spec.GCE {`
	`188`	`+ if c.Spec().Cloud != spec.GCE && !c.IsLocal() {`
`189`	`189`	`t.Skip("uses gs://cockroach-fixtures; see https://github.com/cockroachdb/cockroach/issues/105968")`
`190`	`190`	`}`
`191`	`191`	`runCopy(ctx, t, c, tc.rows, tc.txn)`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ func registerImportCancellation(r registry.Registry) {`
`37`	`37`	`Cluster: r.MakeClusterSpec(6, spec.CPU(32)),`
`38`	`38`	`Leases: registry.MetamorphicLeases,`
`39`	`39`	`Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {`
`40`		`- if c.Spec().Cloud != spec.GCE {`
	`40`	`+ if c.Spec().Cloud != spec.GCE && !c.IsLocal() {`
`41`	`41`	`t.Skip("uses gs://cockroach-fixtures; see https://github.com/cockroachdb/cockroach/issues/105968")`
`42`	`42`	`}`
`43`	`43`	`runImportCancellation(ctx, t, c)`
Original file line number	Diff line number	Diff line change
`@@ -2096,7 +2096,7 @@ func registerBackupMixedVersion(r registry.Registry) {`
`2096`	`2096`	`EncryptionSupport: registry.EncryptionMetamorphic,`
`2097`	`2097`	`RequiresLicense: true,`
`2098`	`2098`	`Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {`
`2099`		`- if c.Spec().Cloud != spec.GCE {`
	`2099`	`+ if c.Spec().Cloud != spec.GCE && !c.IsLocal() {`
`2100`	`2100`	`t.Skip("uses gs://cockroachdb-backup-testing; see https://github.com/cockroachdb/cockroach/issues/105968")`
`2101`	`2101`	`}`
`2102`	`2102`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ func registerDeclSchemaChangeCompatMixedVersions(r registry.Registry) {`
`32`	`32`	`Owner: registry.OwnerSQLFoundations,`
`33`	`33`	`Cluster: r.MakeClusterSpec(1),`
`34`	`34`	`Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {`
`35`		`- if c.Spec().Cloud != spec.GCE {`
	`35`	`+ if c.Spec().Cloud != spec.GCE && !c.IsLocal() {`
`36`	`36`	`t.Skip("uses gs://cockroach-corpus; see https://github.com/cockroachdb/cockroach/issues/105968")`
`37`	`37`	`}`
`38`	`38`	`runDeclSchemaChangeCompatMixedVersions(ctx, t, c, t.BuildVersion())`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ func registerSchemaChangeDuringKV(r registry.Registry) {`
`34`	`34`	`Cluster: r.MakeClusterSpec(5),`
`35`	`35`	`Leases: registry.MetamorphicLeases,`
`36`	`36`	`Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {`
`37`		`- if c.Spec().Cloud != spec.GCE {`
	`37`	`+ if c.Spec().Cloud != spec.GCE && !c.IsLocal() {`
`38`	`38`	`t.Skip("uses gs://cockroach-fixtures; see https://github.com/cockroachdb/cockroach/issues/105968")`
`39`	`39`	`}`
`40`	`40`	const fixturePath = `gs://cockroach-fixtures/workload/tpch/scalefactor=10/backup?AUTH=implicit`
Original file line number	Diff line number	Diff line change
`@@ -317,7 +317,7 @@ WITH into_db = 'defaultdb', unsafe_restore_incompatible_version;`
`317`	`317`	`// NB: sqlsmith failures should never block a release.`
`318`	`318`	`NonReleaseBlocker: true,`
`319`	`319`	`Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {`
`320`		`- if c.Spec().Cloud != spec.GCE {`
	`320`	`+ if c.Spec().Cloud != spec.GCE && !c.IsLocal() {`
`321`	`321`	`t.Skip("uses gs://cockroach-fixtures; see https://github.com/cockroachdb/cockroach/issues/105968")`
`322`	`322`	`}`
`323`	`323`	`runSQLSmith(ctx, t, c, setup, setting)`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ func loadTPCHDataset(`
`44`	`44`	`disableMergeQueue bool,`
`45`	`45`	`secure bool,`
`46`	`46`	`) (retErr error) {`
`47`		`- if c.Spec().Cloud != spec.GCE {`
	`47`	`+ if c.Spec().Cloud != spec.GCE && !c.IsLocal() {`
`48`	`48`	`t.Skip("uses gs://cockroach-fixtures; see https://github.com/cockroachdb/cockroach/issues/105968")`
`49`	`49`	`}`
`50`	`50`
Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ WITH unsafe_restore_incompatible_version;`
`191`	`191`	`Benchmark: true,`
`192`	`192`	`Cluster: r.MakeClusterSpec(3),`
`193`	`193`	`Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {`
`194`		`- if c.Spec().Cloud != spec.GCE {`
	`194`	`+ if c.Spec().Cloud != spec.GCE && !c.IsLocal() {`
`195`	`195`	`t.Skip("uses gs://cockroach-fixtures; see https://github.com/cockroachdb/cockroach/issues/105968")`
`196`	`196`	`}`
`197`	`197`	`runTPCDSVec(ctx, t, c)`