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

tests: Skip a roachtest test until master is on 23.1 #89348

Merged

Conversation

Xiang-Gu
Copy link
Contributor

@Xiang-Gu Xiang-Gu commented Oct 4, 2022

Commit 1: Fixed a bug where we forgot to check whether
job adoption is disabled before resuming a job. It also uncovered
a flaw in another test which we fix.

Commit 2: Skip a roachtest that we recently see failure until
master is on 23.1. The reason is detailed in issue #89345.

Fixes: #88921
Backport commit 1 will also fix #89091

Release note: None

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@Xiang-Gu Xiang-Gu force-pushed the fix-job-compatibility-roachtest-failure branch from fdc8f7d to e52b1a0 Compare October 4, 2022 23:10
There is one place where we resume a job without first checking whether
adoption on that registry is disabled. This commit fixes that.
We skipped a roachtest until master is on v23.1
@Xiang-Gu Xiang-Gu force-pushed the fix-job-compatibility-roachtest-failure branch from e52b1a0 to 714b4d3 Compare October 5, 2022 22:27
@Xiang-Gu Xiang-Gu marked this pull request as ready for review October 6, 2022 15:36
@Xiang-Gu Xiang-Gu requested a review from a team October 6, 2022 15:36
@Xiang-Gu Xiang-Gu requested a review from a team as a code owner October 6, 2022 15:36
Copy link
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.

:lgtm:

Reviewed 1 of 1 files at r1, 1 of 1 files at r2, 1 of 1 files at r3, all commit messages.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @Xiang-Gu)

@Xiang-Gu
Copy link
Contributor Author

Xiang-Gu commented Oct 6, 2022

TFTR!

bors r+

@craig
Copy link
Contributor

craig bot commented Oct 6, 2022

Build succeeded:

@craig craig bot merged commit 06d3121 into cockroachdb:master Oct 6, 2022
@ajwerner
Copy link
Contributor

ajwerner commented Oct 6, 2022

make sure to only backport the first commit

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants