Merge cockroachdb#135255

135255: reports: skip TestCriticalLocalitiesReportIntegration under stress/race r=tbg a=tbg See cockroachdb#134948. Epic: None Release note: None Co-authored-by: Tobias Grieger <[email protected]>
spilchen · Nov 15, 2024 · e6e86b7 · e6e86b7
2 parents 7d943e9 + 6b753d4
commit e6e86b7
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/pkg/kv/kvserver/reports/reporter_test.go b/pkg/kv/kvserver/reports/reporter_test.go
@@ -119,6 +119,11 @@ func TestConstraintConformanceReportIntegration(t *testing.T) {
 func TestCriticalLocalitiesReportIntegration(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
+
+	skip.UnderStressWithIssue(t, 134948)
+	skip.UnderRaceWithIssue(t, 134948)
+	skip.UnderShort(t)
+
 	ctx := context.Background()
 	// 2 regions, 3 dcs per region.
 	tc := serverutils.StartCluster(t, 6, base.TestClusterArgs{