From 85aedf25b78ce14f58fbf636be40538aeeec0b85 Mon Sep 17 00:00:00 2001 From: irfan sharif Date: Mon, 24 Oct 2022 17:18:43 -0400 Subject: [PATCH] roachtest: reduce frequency of benchmark-only AC tests These tests will only serve as coarse-grained benchmarks for things AC cares about -- we don't need to run them nightly. They've spent ~2 weeks through our nightly CI suite without flaking so reduce frequency to a weekly cadence. We'll do this same thing for most tests added as part of \#89208. Release note: None --- .../roachtest/tests/admission_control_elastic_backup.go | 9 +++------ pkg/cmd/roachtest/tests/admission_control_elastic_cdc.go | 9 +++------ .../tests/admission_control_snapshot_overload.go | 9 +++------ 3 files changed, 9 insertions(+), 18 deletions(-) diff --git a/pkg/cmd/roachtest/tests/admission_control_elastic_backup.go b/pkg/cmd/roachtest/tests/admission_control_elastic_backup.go index 77b09c9b7dc6..53c400d995d6 100644 --- a/pkg/cmd/roachtest/tests/admission_control_elastic_backup.go +++ b/pkg/cmd/roachtest/tests/admission_control_elastic_backup.go @@ -36,12 +36,9 @@ import ( // in roachperf. func registerElasticControlForBackups(r registry.Registry) { r.Add(registry.TestSpec{ - Name: "admission-control/elastic-backup", - Owner: registry.OwnerAdmissionControl, - // TODO(irfansharif): After two weeks of nightly baking time, reduce - // this to a weekly cadence. This is a long-running test and serves only - // as a coarse-grained benchmark. - // Tags: []string{`weekly`}, + Name: "admission-control/elastic-backup", + Owner: registry.OwnerAdmissionControl, + Tags: []string{`weekly`}, Cluster: r.MakeClusterSpec(4, spec.CPU(8)), Run: func(ctx context.Context, t test.Test, c cluster.Cluster) { if c.Spec().NodeCount < 4 { diff --git a/pkg/cmd/roachtest/tests/admission_control_elastic_cdc.go b/pkg/cmd/roachtest/tests/admission_control_elastic_cdc.go index 361a90498753..57f805e245bb 100644 --- a/pkg/cmd/roachtest/tests/admission_control_elastic_cdc.go +++ b/pkg/cmd/roachtest/tests/admission_control_elastic_cdc.go @@ -29,12 +29,9 @@ import ( // an increase in foreground latency. func registerElasticControlForCDC(r registry.Registry) { r.Add(registry.TestSpec{ - Name: "admission-control/elastic-cdc", - Owner: registry.OwnerAdmissionControl, - // TODO(irfansharif): After two weeks of nightly baking time, reduce - // this to a weekly cadence. This is a long-running test and serves only - // as a coarse-grained benchmark. - // Tags: []string{`weekly`}, + Name: "admission-control/elastic-cdc", + Owner: registry.OwnerAdmissionControl, + Tags: []string{`weekly`}, Cluster: r.MakeClusterSpec(4, spec.CPU(8)), RequiresLicense: true, Run: func(ctx context.Context, t test.Test, c cluster.Cluster) { diff --git a/pkg/cmd/roachtest/tests/admission_control_snapshot_overload.go b/pkg/cmd/roachtest/tests/admission_control_snapshot_overload.go index d34186c8081c..4d46789f0df8 100644 --- a/pkg/cmd/roachtest/tests/admission_control_snapshot_overload.go +++ b/pkg/cmd/roachtest/tests/admission_control_snapshot_overload.go @@ -38,12 +38,9 @@ import ( // make it shorter. func registerSnapshotOverload(r registry.Registry) { r.Add(registry.TestSpec{ - Name: "admission-control/snapshot-overload", - Owner: registry.OwnerAdmissionControl, - // TODO(irfansharif): After two weeks of nightly baking time, reduce - // this to a weekly cadence. This is a long-running test and serves only - // as a coarse-grained benchmark. - // Tags: []string{`weekly`}, + Name: "admission-control/snapshot-overload", + Owner: registry.OwnerAdmissionControl, + Tags: []string{`weekly`}, Cluster: r.MakeClusterSpec(4, spec.CPU(8)), Run: func(ctx context.Context, t test.Test, c cluster.Cluster) { if c.Spec().NodeCount < 4 {