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.

Sign up for GitHub

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
Merged

roachtest: update version map and fixtures #55445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified pkg/cmd/roachtest/fixtures/1/checkpoint-v19.2.tgz
View file
Open in desktop
Binary file not shown.
Binary file modified pkg/cmd/roachtest/fixtures/1/checkpoint-v20.1.tgz
View file
Open in desktop
Binary file not shown.
Binary file modified pkg/cmd/roachtest/fixtures/2/checkpoint-v19.2.tgz
View file
Open in desktop
Binary file not shown.
Binary file modified pkg/cmd/roachtest/fixtures/2/checkpoint-v20.1.tgz
View file
Open in desktop
Binary file not shown.
Binary file modified pkg/cmd/roachtest/fixtures/3/checkpoint-v19.2.tgz
View file
Open in desktop
Binary file not shown.
Binary file modified pkg/cmd/roachtest/fixtures/3/checkpoint-v20.1.tgz
View file
Open in desktop
Binary file not shown.
Binary file modified pkg/cmd/roachtest/fixtures/4/checkpoint-v19.2.tgz
View file
Open in desktop
Binary file not shown.
Binary file modified pkg/cmd/roachtest/fixtures/4/checkpoint-v20.1.tgz
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions pkg/cmd/roachtest/test_runner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

verMap := map[string]string{
"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 :)

"19.2": "19.1.11",
"19.1": "2.1.9",
"2.2": "2.1.9",
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/roachtest/versionupgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

predV, err := PredecessorVersion(*version.MustParse("v" + newV))
if err != nil {
t.Fatal(err)
Expand Down