Skip to content

Commit

Permalink
Merge pull request #140108 from cockroachdb/blathers/backport-release…
Browse files Browse the repository at this point in the history
…-25.1-140024
  • Loading branch information
rail authored Jan 31, 2025
2 parents 82148c8 + ee01e4c commit 19efdfd
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions pkg/upgrade/upgrademanager/manager_external_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -679,6 +679,7 @@ SELECT id
func TestPrecondition(t *testing.T) {
defer leaktest.AfterTest(t)()
defer log.Scope(t).Close(t)
skip.UnderStress(t, "flaky")

// Start by running v0. We want the precondition of v1 to prevent
// us from reaching v1 (or v2). We want the precondition to not be
Expand Down

0 comments on commit 19efdfd

Please sign in to comment.