Merge #108939

108939: roachtest: ignore upstream flakes in activerecord and sequelize r=rafiss a=rafiss Both of these tests are being worked on upstream to resolve the flakiness. Since CockroachDB itself is not the cause of the flakes, we ignore them so that these tests don't create unnecessary issues. informs #108938 informs #108937 fixes #97283, #99620, #108654, #87580 fixes #98144, #99258, #108662, #98139 Release note: None Co-authored-by: Rafi Shamim <[email protected]>
cockroachdb · Aug 18, 2023 · 72e2510 · 72e2510
2 parents e57a7db + a02bdad
commit 72e2510
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/pkg/cmd/roachtest/tests/activerecord.go b/pkg/cmd/roachtest/tests/activerecord.go
@@ -229,9 +229,14 @@ func registerActiveRecord(r registry.Registry) {
 				results.failExpectedCount++
 				results.currentFailures = append(results.currentFailures, test)
 			case !pass && !expectedFailure:
-				results.results[test] = fmt.Sprintf("--- FAIL: %s (unexpected)", test)
-				results.failUnexpectedCount++
-				results.currentFailures = append(results.currentFailures, test)
+				// The test suite is flaky and work is being done upstream to stabilize
+				// it (https://github.com/cockroachdb/cockroach/issues/108938). Until
+				// that's done, we ignore all failures from this test.
+				// results.results[test] = fmt.Sprintf("--- FAIL: %s (unexpected)", test)
+				// results.failUnexpectedCount++
+				// results.currentFailures = append(results.currentFailures, test)
+				results.results[test] = fmt.Sprintf("--- SKIP: %s due to upstream flakes (https://github.com/cockroachdb/cockroach/issues/108938)", test)
+				results.ignoredCount++
 			}
 			results.runTests[test] = struct{}{}
 		}

diff --git a/pkg/cmd/roachtest/tests/sequelize.go b/pkg/cmd/roachtest/tests/sequelize.go
@@ -145,7 +145,11 @@ func registerSequelize(r registry.Registry) {
 		rawResultsStr := result.Stdout + result.Stderr
 		t.L().Printf("Test Results: %s", rawResultsStr)
 		if err != nil {
-			t.Fatal(err)
+			// The test suite is flaky and work is being done upstream to stabilize
+			// it (https://github.com/sequelize/sequelize/pull/15569). Until that's
+			// done, we ignore all failures from this test.
+			// t.Fatal(err)
+			t.L().Printf("ignoring failure (https://github.com/cockroachdb/cockroach/issues/108937): %s", err)
 		}
 	}