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: choose latest y-stream versioning for rhcos upgrade #3266

Merged
merged 1 commit into from
Dec 15, 2022

Conversation

mike-nguyen
Copy link
Member

The cincinatti graph is used to determine the latest OCP release. It was assumed that only the latest node would have no upgrade path in the graph but that is not the case. When upgrades are blocked, there can be two nodes that no have upgrade path. We need to choose the newest one in the upgrade test.

@mike-nguyen
Copy link
Member Author

This needs to be backported all the way back to 4.10 since that was when this test was added.

cgwalters
cgwalters previously approved these changes Dec 7, 2022
Copy link
Member

@cgwalters cgwalters left a comment

Choose a reason for hiding this comment

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

I'm honestly not fully following the logic here, but I'm assuming you tested this and it looks sane.

mantle/kola/tests/rhcos/upgrade.go Outdated Show resolved Hide resolved
mantle/kola/tests/rhcos/upgrade.go Show resolved Hide resolved
jlebon
jlebon previously approved these changes Dec 8, 2022
mantle/kola/tests/rhcos/upgrade.go Outdated Show resolved Hide resolved
mantle/kola/tests/rhcos/upgrade.go Outdated Show resolved Hide resolved
@mike-nguyen
Copy link
Member Author

Added suggestions. Once this is backported to 4.10 we can remove the hack in coreos/coreos-ci-lib#136

Copy link
Member

@jlebon jlebon left a comment

Choose a reason for hiding this comment

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

I tested it and added it verbatim. Thanks @jlebon!

Awesome, thanks for testing!

mantle/kola/tests/rhcos/upgrade.go Show resolved Hide resolved
The cincinatti graph is used to determine the latest OCP release. It
was assumed that only the latest node would have no upgrade path in
the graph but that is not the case. When upgrades are blocked, there
can be two nodes that no have upgrade path. We need to choose the
newest one in the upgrade test.
@jlebon jlebon enabled auto-merge (rebase) December 15, 2022 16:52
@jlebon jlebon merged commit 48f57ce into coreos:main Dec 15, 2022
@jlebon
Copy link
Member

jlebon commented Dec 16, 2022

/cherrypick rhcos-4.12

@jlebon
Copy link
Member

jlebon commented Dec 16, 2022

/cherrypick rhcos-4.11

@jlebon
Copy link
Member

jlebon commented Dec 16, 2022

/cherrypick rhcos-4.10

@openshift-cherrypick-robot

@jlebon: #3266 failed to apply on top of branch "rhcos-4.11":

Applying: tests: choose latest y-stream versioning for rhcos upgrade
Using index info to reconstruct a base tree...
M	mantle/kola/tests/rhcos/upgrade.go
Falling back to patching base and 3-way merge...
Auto-merging mantle/kola/tests/rhcos/upgrade.go
CONFLICT (content): Merge conflict in mantle/kola/tests/rhcos/upgrade.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 tests: choose latest y-stream versioning for rhcos upgrade
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick rhcos-4.11

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-cherrypick-robot

@jlebon: new pull request created: #3294

In response to this:

/cherrypick rhcos-4.12

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-cherrypick-robot

@jlebon: #3266 failed to apply on top of branch "rhcos-4.10":

Applying: tests: choose latest y-stream versioning for rhcos upgrade
Using index info to reconstruct a base tree...
M	mantle/kola/tests/rhcos/upgrade.go
Falling back to patching base and 3-way merge...
Auto-merging mantle/kola/tests/rhcos/upgrade.go
CONFLICT (content): Merge conflict in mantle/kola/tests/rhcos/upgrade.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 tests: choose latest y-stream versioning for rhcos upgrade
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick rhcos-4.10

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

jlebon added a commit to jlebon/coreos-ci-lib that referenced this pull request Dec 16, 2022
This reverts commit 0642543.

This test should be fixed now by
coreos/coreos-assembler#3266 and backports.
jlebon added a commit to coreos/coreos-ci-lib that referenced this pull request Dec 16, 2022
This reverts commit 0642543.

This test should be fixed now by
coreos/coreos-assembler#3266 and backports.
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.

None yet

4 participants