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

Mass revert 1.5.3 main #396

Merged
merged 6 commits into from
Apr 8, 2024
Merged

Conversation

gkurz
Copy link
Member

@gkurz gkurz commented Apr 8, 2024

- Description of the problem which is fixed/What is the use case

This does a couple of reverts to bring main back to the same state as the v1.5.2 tag. A release branch will be forked from there to push all the 1.5.3 specific fixes.

Fixes: KATA-2876

- What I did

Reverted all merges commit in main since v1.5.2.

- How to verify it

  • Checkout this PR
  • No output expected with git diff v1.5.2

gkurz added 6 commits April 8, 2024 16:24
This reverts commit 59d918f, reversing
changes made to b57ba2c.

Fixes: KATA-2876

Signed-off-by: Greg Kurz <[email protected]>
This reverts commit b57ba2c, reversing
changes made to 70f4684.

Fixes: KATA-2876

Signed-off-by: Greg Kurz <[email protected]>
…re-annotation"

This reverts commit 70f4684, reversing
changes made to bb538b1.

Fixes: KATA-2876

Signed-off-by: Greg Kurz <[email protected]>
This reverts commit bb538b1, reversing
changes made to 1082483.

Fixes: KATA-2876

Signed-off-by: Greg Kurz <[email protected]>
This reverts commit 1082483, reversing
changes made to 2a9ed5e.

Fixes: KATA-2876

Signed-off-by: Greg Kurz <[email protected]>
This reverts commit 2a9ed5e, reversing
changes made to b8b3307.

Fixes: KATA-2876

Signed-off-by: Greg Kurz <[email protected]>
@openshift-ci openshift-ci bot requested review from bpradipt and jensfr April 8, 2024 14:39
Copy link
Contributor

@bpradipt bpradipt left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 8, 2024
Copy link
Contributor

@littlejawa littlejawa left a comment

Choose a reason for hiding this comment

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

lgtm
Thanks @gkurz

Copy link

openshift-ci bot commented Apr 8, 2024

@gkurz: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/sandboxed-containers-operator-e2e 4650b6b link false /test sandboxed-containers-operator-e2e
ci/prow/check 4650b6b link false /test check

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@gkurz gkurz merged commit 3872adf into openshift:main Apr 8, 2024
2 of 4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants