From 3fc660509315e877fe74c336750445816b9559f0 Mon Sep 17 00:00:00 2001 From: Celia La Date: Fri, 3 Sep 2021 18:01:55 -0400 Subject: [PATCH] roachtest: update version map and test fixtures for 22.1 Release justification: Non-production code change. Release note: None --- pkg/cmd/roachtest/tests/predecessor_version.go | 1 + pkg/cmd/roachtest/tests/versionupgrade.go | 2 ++ 2 files changed, 3 insertions(+) diff --git a/pkg/cmd/roachtest/tests/predecessor_version.go b/pkg/cmd/roachtest/tests/predecessor_version.go index ff6dbd12a775..7120e2ef3484 100644 --- a/pkg/cmd/roachtest/tests/predecessor_version.go +++ b/pkg/cmd/roachtest/tests/predecessor_version.go @@ -36,6 +36,7 @@ func PredecessorVersion(buildVersion version.Version) (string, error) { // checkpoint option enabled to create the missing store directory // fixture (see runVersionUpgrade). verMap := map[string]string{ + "22.1": "21.2.0-alpha.1", "21.2": "21.1.8", "21.1": "20.2.12", "20.2": "20.1.16", diff --git a/pkg/cmd/roachtest/tests/versionupgrade.go b/pkg/cmd/roachtest/tests/versionupgrade.go index af1f1d22a68a..838041623a12 100644 --- a/pkg/cmd/roachtest/tests/versionupgrade.go +++ b/pkg/cmd/roachtest/tests/versionupgrade.go @@ -92,6 +92,8 @@ func runVersionUpgrade(ctx context.Context, t test.Test, c cluster.Cluster) { // the 20.2 release, this test will fail because it is missing a fixture for // 20.1; run the test (on 20.1) with the bool flipped to create the fixture. // Check it in (instructions will be logged below) and off we go. + // TODO(celia) set this to true and regenerate fixtures, + // as per https://cockroachlabs.atlassian.net/wiki/spaces/ENG/pages/73105625/Release+process#Releaseprocess-Updateversionmapinroachtestandregeneratetestfixtures if false { // The version to create/update the fixture for. Must be released (i.e. // can download it from the homepage); if that is not the case use the