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

Jump to bottom

roachtest: update version map and test fixtures for 21.2 #64610

Merged
merged 1 commit into from
May 4, 2021
Merged

roachtest: update version map and test fixtures for 21.2 #64610

merged 1 commit into from
May 4, 2021

Conversation

j-low
Copy link
Contributor

@j-low j-low commented May 3, 2021 •
edited by erikgrinaker
Loading

Fixes #64595.
Fixes #64594.
Fixes #64537.
Fixes #64525.
Fixes #64596.
Fixes #58237.
Fixes #64603.
Fixes #64611.
Fixes #64210.
Fixes #64618.

Release note: None

@j-low j-low requested a review from irfansharif May 3, 2021 20:42
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@j-low j-low requested a review from dt May 3, 2021 20:42
j-low
j-low commented May 3, 2021
View reviewed changes
pkg/cmd/roachtest/acceptance.go Outdated Show resolved Hide resolved
irfansharif
irfansharif approved these changes May 3, 2021
View reviewed changes
Copy link
Contributor

@irfansharif irfansharif left a comment

Choose a reason for hiding this comment

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

Thanks! Feel free to close out all the linked issues once merged (or link to them in the commit message here to have it done for you).

pkg/cmd/roachtest/acceptance.go Outdated Show resolved Hide resolved
@j-low
Copy link
Contributor Author

j-low commented May 3, 2021 •
edited
Loading

@irfansharif TFTR! Will revert line before merge and close link issues below.

@j-low j-low force-pushed the 21.2-update-version-map-and-fixtures branch from c94ac83 to 4fed62a Compare May 3, 2021 20:46
@j-low
Copy link
Contributor Author

j-low commented May 3, 2021

Fixes #64595 #64594 #64537 #64525 #64596 #58237 #64603

@j-low j-low force-pushed the 21.2-update-version-map-and-fixtures branch from 4fed62a to 747e58e Compare May 3, 2021 20:55
@irfansharif
Copy link
Contributor

I see the fixtures are checkpoint-v20.2-48.tgz, I think we want them to be generated using the 21.1 beta build (it's currently tripping up CI).

@tbg
Copy link
Member

tbg commented May 4, 2021

v21.1.0-beta.5 unfortunately self-identifies as 20.2-48, i.e. it doesn't have the 20.2.0 cluster version yet. Unfortunately there also isn't a newer released version that has the correct cluster version. So we're looking at hacking it, I'll give that a shot.

@tbg tbg force-pushed the 21.2-update-version-map-and-fixtures branch from 747e58e to 22a1450 Compare May 4, 2021 08:16
@j-low @tbg
roachtest: update version map and test fixtures for 21.2
debd06a 
Unfortunately, the latest 21.1 prerelease available (beta.5) has an
incorrect cluster version (20.2-48 instead of 21.1), so the created
fixtures identify as 20.2-48. We need to regenerate these fixtures
once we bump the min supported version:

https://github.com/cockroachdb/cockroach/blob/684e753c15f3fc58df79b6ea70e7b6715eae4835/pkg/clusterversion/cockroach_versions.go#L567

which we will eventually do. Since we bump the fixtures on the major
release, this should happen in due time.

Release note: None
@tbg tbg force-pushed the 21.2-update-version-map-and-fixtures branch from 22a1450 to debd06a Compare May 4, 2021 08:20
@tbg
Copy link
Member

tbg commented May 4, 2021 •
edited
Loading

I updated this PR by renaming the 20.2-48 fixture to 21.1. This should work until we bump the MinSupportedVersion, which we should only do when 21.1.0 is out the door (and at which point the fixtures have been regenerated).

@tbg
Copy link
Member

tbg commented May 4, 2021

bors r+

@tbg tbg mentioned this pull request May 4, 2021
Merged
@craig
Copy link
Contributor

craig bot commented May 4, 2021

Build succeeded:

@craig craig bot merged commit e3327f0 into cockroachdb:master May 4, 2021
tbg added a commit to tbg/cockroach that referenced this pull request May 4, 2021
@tbg
roachtest: unskip acceptance/version-upgrade
42dab7f 
This test should pass again, now that cockroachdb#64610 is in.

Release note: None
@j-low
Copy link
Contributor Author

j-low commented May 4, 2021

TY @tbg and @irfansharif for helping get this across the line.

@j-low j-low deleted the 21.2-update-version-map-and-fixtures branch May 4, 2021 12:56
craig bot pushed a commit that referenced this pull request May 5, 2021
@tbg
Merge #64642
6e4f431 
64642: roachtest: unskip acceptance/version-upgrade r=erikgrinaker a=tbg

This test should pass again, now that #64610 is in.

Fixes #64491.

Release note: None


Co-authored-by: Tobias Grieger <tobias.b.grieger@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@irfansharif irfansharif irfansharif approved these changes

@dt dt Awaiting requested review from dt

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
4 participants
@j-low @cockroach-teamcity @irfansharif @tbg