From d517243b5d876a67090ab5b4f0b731417fc54d9e Mon Sep 17 00:00:00 2001 From: Chengxiong Ruan Date: Wed, 28 Jun 2023 15:41:40 -0400 Subject: [PATCH 1/2] sql: skip multiregional tests again Unfortunately, it's still flaky: https://github.com/cockroachdb/cockroach/pull/105346#issuecomment-1611879332 Release note: None --- pkg/ccl/multiregionccl/testdata/secondary_region | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/ccl/multiregionccl/testdata/secondary_region b/pkg/ccl/multiregionccl/testdata/secondary_region index 9fb454dab0cb..16a3c9fc94da 100644 --- 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 ---- From 0e46af9f458efcc739aa251bb3712c9cd25619ed Mon Sep 17 00:00:00 2001 From: zachlite Date: Fri, 30 Jun 2023 10:28:38 -0400 Subject: [PATCH 2/2] persistedsqlstats: skip TestSQLStatsPersistedLimitReached Flakes in Bazel essential CI. Informs #105846, #97488 Epic: none Release note: None --- pkg/sql/sqlstats/persistedsqlstats/flush_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/sql/sqlstats/persistedsqlstats/flush_test.go b/pkg/sql/sqlstats/persistedsqlstats/flush_test.go index ae2ffe6cdb26..ac699ba97029 100644 --- 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)