Skip to content

Commit

Permalink
roachtest: set acceptance/version-upgrade timeout to 30m
Browse files Browse the repository at this point in the history
When adding aggressive consistency checks, I noticed that
acceptance/version-upgrade got pushed over the limit.

Release note: None
  • Loading branch information
tbg committed Oct 16, 2019
1 parent 8dd98cc commit a0fdd9e
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion pkg/cmd/roachtest/acceptance.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ func registerAcceptance(r *testRegistry) {
fn func(ctx context.Context, t *test, c *cluster)
skip string
minVersion string
timeout time.Duration
}{
// Sorted. Please keep it that way.
{name: "bank/cluster-recovery", fn: runBankClusterRecovery},
Expand All @@ -43,7 +44,7 @@ func registerAcceptance(r *testRegistry) {
{name: "gossip/locality-address", fn: runCheckLocalityIPAddress},
{name: "rapid-restart", fn: runRapidRestart},
{name: "status-server", fn: runStatusServer},
{name: "version-upgrade", fn: runVersionUpgrade, minVersion: "v19.1.0"},
{name: "version-upgrade", fn: runVersionUpgrade, minVersion: "v19.1.0", timeout: 30 * time.Minute},
}
tags := []string{"default", "quick"}
const numNodes = 4
Expand All @@ -65,6 +66,9 @@ func registerAcceptance(r *testRegistry) {
spec := specTemplate
spec.Name = specTemplate.Name + "/" + tc.name
spec.MinVersion = tc.minVersion
if tc.timeout != 0 {
spec.Timeout = tc.timeout
}
spec.Run = func(ctx context.Context, t *test, c *cluster) {
tc.fn(ctx, t, c)
}
Expand Down

0 comments on commit a0fdd9e

Please sign in to comment.