From ccc0ffa3857c5bad4fc291e6492b81c0e4f4d970 Mon Sep 17 00:00:00 2001 From: DarrylWong Date: Tue, 7 May 2024 15:00:35 -0400 Subject: [PATCH] roachtest: disable azure tests that use zfs or specify ssd counts Both these options are not supported for roachprod azure yet, resulting in cluster_creation errors. Informs: #120621 Fixes: none Epic: none Release note: none --- pkg/cmd/roachtest/tests/clearrange.go | 2 +- pkg/cmd/roachtest/tests/tpce.go | 4 ++-- pkg/cmd/roachtest/tests/ycsb.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/cmd/roachtest/tests/clearrange.go b/pkg/cmd/roachtest/tests/clearrange.go index 76a2b8e4f9ad..0d42d04c3754 100644 --- a/pkg/cmd/roachtest/tests/clearrange.go +++ b/pkg/cmd/roachtest/tests/clearrange.go @@ -52,7 +52,7 @@ func registerClearRange(r registry.Registry) { // to <3:30h but it varies. Timeout: 5*time.Hour + 120*time.Minute, Cluster: r.MakeClusterSpec(10, spec.CPU(16), spec.SetFileSystem(spec.Zfs)), - CompatibleClouds: registry.AllExceptAWS, + CompatibleClouds: registry.OnlyGCE, Suites: registry.Suites(registry.Nightly), EncryptionSupport: registry.EncryptionMetamorphic, Leases: registry.MetamorphicLeases, diff --git a/pkg/cmd/roachtest/tests/tpce.go b/pkg/cmd/roachtest/tests/tpce.go index cbff7f36df1a..dd6d1e3a5203 100644 --- a/pkg/cmd/roachtest/tests/tpce.go +++ b/pkg/cmd/roachtest/tests/tpce.go @@ -282,7 +282,7 @@ func registerTPCE(r registry.Registry) { Owner: registry.OwnerTestEng, Timeout: 4 * time.Hour, Cluster: r.MakeClusterSpec(smallNightly.nodes+1, spec.CPU(smallNightly.cpus), spec.SSD(smallNightly.ssds)), - CompatibleClouds: registry.AllExceptAWS, + CompatibleClouds: registry.OnlyGCE, Suites: registry.Suites(registry.Nightly), // Never run with runtime assertions as this makes this test take // too long to complete. @@ -303,7 +303,7 @@ func registerTPCE(r registry.Registry) { Name: fmt.Sprintf("tpce/c=%d/nodes=%d", largeWeekly.customers, largeWeekly.nodes), Owner: registry.OwnerTestEng, Benchmark: true, - CompatibleClouds: registry.AllExceptAWS, + CompatibleClouds: registry.OnlyGCE, Suites: registry.Suites(registry.Weekly), Timeout: 36 * time.Hour, Cluster: r.MakeClusterSpec(largeWeekly.nodes+1, spec.CPU(largeWeekly.cpus), spec.SSD(largeWeekly.ssds)), diff --git a/pkg/cmd/roachtest/tests/ycsb.go b/pkg/cmd/roachtest/tests/ycsb.go index c6e2204ce434..c5dc291cceb5 100644 --- a/pkg/cmd/roachtest/tests/ycsb.go +++ b/pkg/cmd/roachtest/tests/ycsb.go @@ -140,7 +140,7 @@ func registerYCSB(r registry.Registry) { Run: func(ctx context.Context, t test.Test, c cluster.Cluster) { runYCSB(ctx, t, c, wl, cpus, ycsbOptions{}) }, - CompatibleClouds: registry.AllExceptAWS, + CompatibleClouds: registry.OnlyGCE, Suites: registry.Suites(registry.Nightly), }) }