Merge pull request #108968 from cockroachdb/blathers/backport-release…

…-22.2-108939

release-22.2: roachtest: ignore upstream flakes in activerecord and sequelize

pkg/cmd/roachtest/tests/activerecord.go

@@ -228,9 +228,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{}{}
 		}

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)
 		}
 	}