Commit ea00c03d authored by Tobias Schottdorf's avatar Tobias Schottdorf Committed by Raphael 'kena' Poss

roachtest: set PredecessorVersion(20.2)=20.1.0

Unbreaks CI.

Release note: None
parent d244a6d9
......@@ -1142,6 +1142,7 @@ func PredecessorVersion(buildVersion version.Version) (string, error) {
// (see runVersionUpgrade). The same is true for adding a new key to this
// map.
verMap := map[string]string{
"20.2": "20.1.0",
"20.1": "19.2.6",
"19.2": "19.1.5",
"19.1": "2.1.9",
......
......@@ -425,6 +425,7 @@ func stmtFeatureTest(
func makeVersionFixtureAndFatal(
ctx context.Context, t *test, c *cluster, predecessorVersion string, makeFixtureVersion string,
) {
c.l.Printf("making fixture for %s (starting at %s)", makeFixtureVersion, predecessorVersion)
c.encryptDefault = false
newVersionUpgradeTest(c,
// Start the cluster from a fixture. That fixture's cluster version may
......
......@@ -135,7 +135,7 @@ func (opts Options) filename() string {
// Downloading binaries may take some time, so give ourselves
// some room before the timeout expires.
var httpClient = httputil.NewClientWithTimeout(30 * time.Second)
var httpClient = httputil.NewClientWithTimeout(300 * time.Second)
// Download downloads the binary for the given version, and skips the download
// if the archive is already present in `destDir`.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment