Merge #105758 #105893

105758: sql: skip multiregional tests again r=chengxiong-ruan a=chengxiong-ruan Unfortunately, it's still flaky: #105346 (comment) Informs: #98020 Release note: None 105893: persistedsqlstats: skip TestSQLStatsPersistedLimitReached r=zachlite a=zachlite Flakes in Bazel essential CI. Reverts #105770 Informs #105846, #97488 Epic: none Release note: None Co-authored-by: Chengxiong Ruan <[email protected]> Co-authored-by: zachlite <[email protected]>
cockroachdb · Jun 30, 2023 · 947a636 · 947a636
3 parents 66c9f93 + d517243 + 0e46af9
commit 947a636
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/pkg/ccl/multiregionccl/testdata/secondary_region b/pkg/ccl/multiregionccl/testdata/secondary_region
@@ -1,3 +1,6 @@
+skip issue-num=98020
+----
+
 new-cluster localities=us-east-1,us-east-1,us-west-1,us-west-1,us-central-1,us-central-1,us-central-1,eu-west-1,eu-west-1,eu-west-1
 ----
 

diff --git a/pkg/sql/sqlstats/persistedsqlstats/flush_test.go b/pkg/sql/sqlstats/persistedsqlstats/flush_test.go
@@ -459,7 +459,7 @@ func TestSQLStatsGatewayNodeSetting(t *testing.T) {
 }
 
 func TestSQLStatsPersistedLimitReached(t *testing.T) {
-	skip.UnderStressWithIssue(t, 97488)
+	skip.WithIssue(t, 97488)
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)