Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

roachtest: update version map and fixtures #55445

Merged
merged 1 commit into from
Oct 15, 2020

Conversation

celiala
Copy link
Collaborator

@celiala celiala commented Oct 12, 2020

This commit adds the recently released 19.2.11, and 20.1.7
to the version map in PredecessorVersion.

Release note: None (testing change)

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@celiala
Copy link
Collaborator Author

celiala commented Oct 12, 2020

For release tracking issues:

@@ -1171,8 +1171,8 @@ func PredecessorVersion(buildVersion version.Version) (string, error) {
// (see runVersionUpgrade). The same is true for adding a new key to this
// map.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The fixtures also need to be updated like in this PR.

Note, there were some issues with this in the last couple releases that should be fixed now. If you need it, see #55253 for reference.

@celiala celiala force-pushed the bump-version-map branch 2 times, most recently from 15214bd to 9f79ed2 Compare October 15, 2020 04:22
@celiala celiala changed the title roachtest: update version map roachtest: update version map and fixtures Oct 15, 2020
@celiala
Copy link
Collaborator Author

celiala commented Oct 15, 2020

Thanks @arulajmani and @irfansharif to helping me figure out how to generate the fixtures! 💯

This is RFAL, thank you!

"20.2": "20.1.6",
"20.1": "19.2.9",
"20.2": "20.1.7",
"20.1": "19.2.11",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I only see the fixtures in pkg/cmd/roachtest/fixtures/*/checkpoint-v20.1.tgz being updated, but it seems we're also bumping the version map for 19.2.11? If I've understood correctly, we'll need to generate fixtures for that too. We can do so by changing newV below for one run and copying those artifacts in.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, thank you! Done :)

@@ -94,7 +94,7 @@ func runVersionUpgrade(ctx context.Context, t *test, c *cluster, buildVersion ve
// 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
// empty string which uses the local cockroach binary.
newV := "20.1.6"
newV := "20.1.7"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here.

This commit adds the recently released 19.2.11, and 20.1.7
to the version map in PredecessorVersion.

Release note: None (testing change)
@celiala
Copy link
Collaborator Author

celiala commented Oct 15, 2020

Thanks for the reviews and all the help!

@celiala
Copy link
Collaborator Author

celiala commented Oct 15, 2020

bors r+

@craig
Copy link
Contributor

craig bot commented Oct 15, 2020

Build succeeded:

@craig craig bot merged commit 88b4341 into cockroachdb:master Oct 15, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants