From e9b9e504c8d34fa6c520f6fb2f4bc1966a4f3544 Mon Sep 17 00:00:00 2001 From: Rafi Shamim Date: Thu, 17 Aug 2023 20:44:30 +0000 Subject: [PATCH] roachtest: ignore upstream flakes in activerecord and sequelize 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. Release note: None --- pkg/cmd/roachtest/tests/activerecord.go | 11 ++++++++--- pkg/cmd/roachtest/tests/sequelize.go | 6 +++++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/pkg/cmd/roachtest/tests/activerecord.go b/pkg/cmd/roachtest/tests/activerecord.go index 14406242af58..455a5430086e 100644 --- a/pkg/cmd/roachtest/tests/activerecord.go +++ b/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{}{} } diff --git a/pkg/cmd/roachtest/tests/sequelize.go b/pkg/cmd/roachtest/tests/sequelize.go index 193351c9185b..d4c77139f46a 100644 --- 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) } }