Merge #99121

99121: *: skip flaky tests r=adityamaru a=adityamaru Informs: #98987 Informs: #98020 Informs: #98905 Informs: #98564 Informs: #98991 Release note: None Epic: none Co-authored-by: adityamaru <[email protected]>
cockroachdb · Mar 21, 2023 · 5c48aa2 · 5c48aa2
2 parents 5f5cf26 + 848ed32
commit 5c48aa2
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 0 deletions.
diff --git a/pkg/ccl/kvccl/kvtenantccl/tenant_upgrade_test.go b/pkg/ccl/kvccl/kvtenantccl/tenant_upgrade_test.go
@@ -403,6 +403,7 @@ func TestTenantUpgradeFailure(t *testing.T) {
 // is too low.
 func TestTenantUpgradeInterlock(t *testing.T) {
 	defer leaktest.AfterTest(t)()
+	skip.WithIssue(t, 98987)
 	// Times out under stress race
 	skip.UnderStressRace(t)
 	// Test takes 30s to run

diff --git a/pkg/ccl/multiregionccl/datadriven_test.go b/pkg/ccl/multiregionccl/datadriven_test.go
@@ -131,6 +131,11 @@ func TestMultiRegionDataDriven(t *testing.T) {
 		var recCh chan tracingpb.Recording
 		datadriven.RunTest(t, path, func(t *testing.T, d *datadriven.TestData) string {
 			switch d.Cmd {
+			case "skip":
+				var issue int
+				d.ScanArgs(t, "issue-num", &issue)
+				skip.WithIssue(t, issue)
+				return ""
 			case "sleep-for-follower-read":
 				time.Sleep(time.Second)
 			case "new-cluster":

diff --git a/pkg/ccl/multiregionccl/testdata/regional_by_table b/pkg/ccl/multiregionccl/testdata/regional_by_table
@@ -1,3 +1,6 @@
+skip issue-num=98020
+----
+
 new-cluster localities=us-east-1,us-east-1,us-east-1,us-west-1,us-west-1,us-west-1,us-central-1,eu-central-1,eu-west-1
 ----
 

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/cmd/roachtest/tests/versionupgrade.go b/pkg/cmd/roachtest/tests/versionupgrade.go
@@ -134,6 +134,10 @@ func runVersionUpgrade(ctx context.Context, t test.Test, c cluster.Cluster) {
 	mvt.InMixedVersion(
 		"test schema change step",
 		func(ctx context.Context, l *logger.Logger, rng *rand.Rand, h *mixedversion.Helper) error {
+			if c.IsLocal() {
+				l.Printf("skipping step in bors builds while failures are handled -- #99115")
+				return nil
+			}
 			l.Printf("running schema workload step")
 			runCmd := roachtestutil.NewCommand("./workload run schemachange").Flag("verbose", 1).Flag("max-ops", 10).Flag("concurrency", 2).Arg("{pgurl:1-%d}", len(c.All()))
 			randomNode := h.RandomNode(rng, c.All())

diff --git a/pkg/kv/kvserver/client_replica_test.go b/pkg/kv/kvserver/client_replica_test.go
@@ -2686,6 +2686,8 @@ func TestSystemZoneConfigs(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
+	skip.WithIssue(t, 98905)
+
 	// This test is relatively slow and resource intensive. When run under
 	// stressrace on a loaded machine (as in the nightly tests), sometimes the
 	// SucceedsSoon conditions below take longer than the allotted time (#25273).

diff --git a/pkg/upgrade/upgrades/schema_changes_external_test.go b/pkg/upgrade/upgrades/schema_changes_external_test.go
@@ -69,6 +69,7 @@ type schemaChangeTestCase struct {
 // exponential backoff to the system.jobs table, but was retrofitted to prevent
 // regressions.
 func TestMigrationWithFailures(t *testing.T) {
+	skip.WithIssue(t, 98564)
 	const createTableBefore = `
 CREATE TABLE test.test_table (
 	id                INT8      DEFAULT unique_rowid() PRIMARY KEY,
@@ -173,6 +174,8 @@ CREATE TABLE test.test_table (
 // alters a column in a table multiple times with failures at different stages
 // of the migration.
 func TestMigrationWithFailuresMultipleAltersOnSameColumn(t *testing.T) {
+	skip.WithIssue(t, 98991)
+
 	const createTableBefore = `
 CREATE TABLE test.test_table (
    username STRING NOT NULL