Skip to content

upgrades: use TestingBinaryMinSupportedVersion in tests#100726

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
rafiss:fix-upgrades-test
Apr 6, 2023
Merged

upgrades: use TestingBinaryMinSupportedVersion in tests#100726
craig[bot] merged 1 commit intocockroachdb:masterfrom
rafiss:fix-upgrades-test

Conversation

@rafiss
Copy link
Copy Markdown
Collaborator

@rafiss rafiss commented Apr 5, 2023

As described in #100552, it's important for this API to use TestingBinaryMinSupportedVersion in order to correctly bootstrap on the older version.

informs #100552
Release note: None

@rafiss rafiss added the backport-23.1.x PAST MAINTENANCE SUPPORT: 23.1 patch releases via ER request only label Apr 5, 2023
@rafiss rafiss requested review from a team, ajwerner and chengxiong-ruan April 5, 2023 16:45
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@rafiss rafiss force-pushed the fix-upgrades-test branch from 0757303 to c2090a5 Compare April 5, 2023 17:31
@rafiss rafiss requested a review from a team as a code owner April 5, 2023 17:31
@rafiss rafiss requested review from herkolategan and srosenberg and removed request for a team April 5, 2023 17:31
Copy link
Copy Markdown
Contributor

@ajwerner ajwerner left a comment

Choose a reason for hiding this comment

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

Needs some bazel generation. You have my stamp when CI is green.

Reviewed 10 of 11 files at r1, all commit messages.
Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @chengxiong-ruan, @herkolategan, and @srosenberg)

@rafiss rafiss force-pushed the fix-upgrades-test branch 3 times, most recently from f374f6b to 166e85c Compare April 5, 2023 22:20
@rafiss
Copy link
Copy Markdown
Collaborator Author

rafiss commented Apr 6, 2023

bors r+

1 similar comment
@rafiss
Copy link
Copy Markdown
Collaborator Author

rafiss commented Apr 6, 2023

bors r+

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Apr 6, 2023

Merge conflict.

As described in cockroachdb#100552, it's important for this API to use
TestingBinaryMinSupportedVersion in order to correctly bootstrap on the
older version.

Removed TestFixUserfileRelatedDescriptorCorruptionUpgrade and TestPreconditionBeforeStartingAnUpgrade
since they are for 22.2 migrations.

Release note: None
@rafiss rafiss force-pushed the fix-upgrades-test branch from 166e85c to 2ebc229 Compare April 6, 2023 14:30
@rafiss
Copy link
Copy Markdown
Collaborator Author

rafiss commented Apr 6, 2023

bors r+

@craig craig bot merged commit 7d21940 into cockroachdb:master Apr 6, 2023
@craig
Copy link
Copy Markdown
Contributor

craig bot commented Apr 6, 2023

Build succeeded:

@blathers-crl
Copy link
Copy Markdown

blathers-crl bot commented Apr 6, 2023

Encountered an error creating backports. Some common things that can go wrong:

  1. The backport branch might have already existed.
  2. There was a merge conflict.
  3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.


error creating merge commit from 2ebc229 to blathers/backport-release-23.1-100726: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 23.1.x failed. See errors above.


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-23.1.x PAST MAINTENANCE SUPPORT: 23.1 patch releases via ER request only

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants