diff --git a/TEAMS.yaml b/TEAMS.yaml index 0ca157cfbd54..7aa210c9df88 100644 --- a/TEAMS.yaml +++ b/TEAMS.yaml @@ -44,10 +44,6 @@ cockroachdb/kv: cockroachdb/kv-prs: other triage_column_id: 14242655 label: T-kv -cockroachdb/replication: - aliases: - cockroachdb/repl-prs: other - label: T-kv-replication cockroachdb/spatial: triage_column_id: 9487269 label: T-spatial diff --git a/pkg/cmd/roachtest/registry/filter_test.go b/pkg/cmd/roachtest/registry/filter_test.go index 0f7abd8fee13..a59f8415586c 100644 --- a/pkg/cmd/roachtest/registry/filter_test.go +++ b/pkg/cmd/roachtest/registry/filter_test.go @@ -22,9 +22,8 @@ import ( func init() { OverrideTeams(team.Map{ - OwnerCDC.ToTeamAlias(): {}, - OwnerKV.ToTeamAlias(): {}, - OwnerReplication.ToTeamAlias(): {}, + OwnerCDC.ToTeamAlias(): {}, + OwnerKV.ToTeamAlias(): {}, }) } diff --git a/pkg/cmd/roachtest/registry/owners.go b/pkg/cmd/roachtest/registry/owners.go index 5498007125d3..b7d2372a53bd 100644 --- a/pkg/cmd/roachtest/registry/owners.go +++ b/pkg/cmd/roachtest/registry/owners.go @@ -27,7 +27,6 @@ const ( OwnerCDC Owner = `cdc` OwnerDisasterRecovery Owner = `disaster-recovery` OwnerKV Owner = `kv` - OwnerReplication Owner = `replication` OwnerAdmissionControl Owner = `admission-control` OwnerObservability Owner = `obs-prs` OwnerObservabilityIndia Owner = `obs-india-prs` diff --git a/pkg/cmd/roachtest/registry/testdata/filter/describe b/pkg/cmd/roachtest/registry/testdata/filter/describe index 147c9ac402fa..7cfac9b6ecad 100644 --- a/pkg/cmd/roachtest/registry/testdata/filter/describe +++ b/pkg/cmd/roachtest/registry/testdata/filter/describe @@ -24,9 +24,9 @@ describe cloud=gce suite=nightly ---- tests which are compatible with cloud "gce" and are part of the "nightly" suite -describe cloud=local owner=replication benchmarks +describe cloud=local owner=kv benchmarks ---- -benchmarks which are compatible with cloud "local" and have owner "replication" +benchmarks which are compatible with cloud "local" and have owner "kv" describe cloud=gce suite=nightly foo diff --git a/pkg/cmd/roachtest/registry/testdata/filter/errors b/pkg/cmd/roachtest/registry/testdata/filter/errors index 4fc727872f7a..c0daa7db7d38 100644 --- a/pkg/cmd/roachtest/registry/testdata/filter/errors +++ b/pkg/cmd/roachtest/registry/testdata/filter/errors @@ -23,10 +23,6 @@ filter suite=orm ---- error: no tests in suite "orm" -filter owner=replication ----- -error: no tests with owner "replication" - filter benchmarks component_blargle ---- diff --git a/pkg/cmd/roachtest/tests/inconsistency.go b/pkg/cmd/roachtest/tests/inconsistency.go index 9c1e979b79d7..16c404bebec9 100644 --- a/pkg/cmd/roachtest/tests/inconsistency.go +++ b/pkg/cmd/roachtest/tests/inconsistency.go @@ -25,7 +25,7 @@ import ( func registerInconsistency(r registry.Registry) { r.Add(registry.TestSpec{ Name: "inconsistency", - Owner: registry.OwnerReplication, + Owner: registry.OwnerKV, Cluster: r.MakeClusterSpec(3), CompatibleClouds: registry.AllExceptAWS, Suites: registry.Suites(registry.Nightly), diff --git a/pkg/cmd/roachtest/tests/kv.go b/pkg/cmd/roachtest/tests/kv.go index 7613eaf0adaa..45f0ee3a789a 100644 --- a/pkg/cmd/roachtest/tests/kv.go +++ b/pkg/cmd/roachtest/tests/kv.go @@ -438,7 +438,7 @@ func registerKVContention(r registry.Registry) { func registerKVQuiescenceDead(r registry.Registry) { r.Add(registry.TestSpec{ Name: "kv/quiescence/nodes=3", - Owner: registry.OwnerReplication, + Owner: registry.OwnerKV, Cluster: r.MakeClusterSpec(4, spec.WorkloadNode()), CompatibleClouds: registry.AllExceptAWS, Suites: registry.Suites(registry.Nightly), diff --git a/pkg/cmd/roachtest/tests/loss_of_quorum_recovery.go b/pkg/cmd/roachtest/tests/loss_of_quorum_recovery.go index 2bcaa17ddecb..73c351902093 100644 --- a/pkg/cmd/roachtest/tests/loss_of_quorum_recovery.go +++ b/pkg/cmd/roachtest/tests/loss_of_quorum_recovery.go @@ -71,7 +71,7 @@ func registerLOQRecovery(r registry.Registry) { testSpec := s r.Add(registry.TestSpec{ Name: s.testName(""), - Owner: registry.OwnerReplication, + Owner: registry.OwnerKV, Benchmark: true, CompatibleClouds: registry.AllExceptAWS, Suites: registry.Suites(registry.Nightly), @@ -86,7 +86,7 @@ func registerLOQRecovery(r registry.Registry) { }) r.Add(registry.TestSpec{ Name: s.testName("half-online"), - Owner: registry.OwnerReplication, + Owner: registry.OwnerKV, Benchmark: true, CompatibleClouds: registry.AllExceptAWS, Suites: registry.Suites(registry.Nightly), diff --git a/pkg/cmd/roachtest/tests/mixed_version_change_replicas.go b/pkg/cmd/roachtest/tests/mixed_version_change_replicas.go index 176ff2b48c6a..685efe8068a1 100644 --- a/pkg/cmd/roachtest/tests/mixed_version_change_replicas.go +++ b/pkg/cmd/roachtest/tests/mixed_version_change_replicas.go @@ -31,7 +31,7 @@ import ( func registerChangeReplicasMixedVersion(r registry.Registry) { r.Add(registry.TestSpec{ Name: "change-replicas/mixed-version", - Owner: registry.OwnerReplication, + Owner: registry.OwnerKV, Cluster: r.MakeClusterSpec(4), CompatibleClouds: registry.AllExceptAWS, Suites: registry.Suites(registry.Nightly), diff --git a/pkg/cmd/roachtest/tests/replicagc.go b/pkg/cmd/roachtest/tests/replicagc.go index ace7e7c2a569..5908118912af 100644 --- a/pkg/cmd/roachtest/tests/replicagc.go +++ b/pkg/cmd/roachtest/tests/replicagc.go @@ -31,7 +31,7 @@ func registerReplicaGC(r registry.Registry) { for _, restart := range []bool{true, false} { r.Add(registry.TestSpec{ Name: fmt.Sprintf("replicagc-changed-peers/restart=%t", restart), - Owner: registry.OwnerReplication, + Owner: registry.OwnerKV, Cluster: r.MakeClusterSpec(6), CompatibleClouds: registry.AllExceptAWS, Suites: registry.Suites(registry.Nightly), diff --git a/pkg/internal/team/TEAMS.yaml b/pkg/internal/team/TEAMS.yaml index 0ca157cfbd54..7aa210c9df88 100644 --- a/pkg/internal/team/TEAMS.yaml +++ b/pkg/internal/team/TEAMS.yaml @@ -44,10 +44,6 @@ cockroachdb/kv: cockroachdb/kv-prs: other triage_column_id: 14242655 label: T-kv -cockroachdb/replication: - aliases: - cockroachdb/repl-prs: other - label: T-kv-replication cockroachdb/spatial: triage_column_id: 9487269 label: T-spatial