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

[release-4.18] NO-JIRA: Remove clevis overrides for OKD #1677

Merged
merged 1 commit into from
Dec 9, 2024
Merged

[release-4.18] NO-JIRA: Remove clevis overrides for OKD #1677

merged 1 commit into from
Dec 9, 2024

Conversation

openshift-cherrypick-robot
Copy link

This is an automated cherry-pick of #1675

/assign Prashanth684

@Prashanth684
Remove clevis overrides for OKD
389221a 
Due to openshift#1630, we had to pin clevis
to an older version. This was fixed in clevis-21-203.el9, so removing
this
@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Dec 9, 2024
Merged
@openshift-ci openshift-ci bot requested review from c4rt0 and ravanelli December 9, 2024 18:24
@Prashanth684 Prashanth684 added backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. labels Dec 9, 2024
dustymabe
dustymabe approved these changes Dec 9, 2024
View reviewed changes
Copy link
Member

@dustymabe dustymabe 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 Dec 9, 2024
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Dec 9, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dustymabe, openshift-cherrypick-robot

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 9, 2024
@Prashanth684 Prashanth684 added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. labels Dec 9, 2024
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Dec 9, 2024

@openshift-cherrypick-robot: all tests passed!

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

@openshift-merge-bot openshift-merge-bot bot merged commit e9ca904 into openshift:release-4.18 Dec 9, 2024
5 checks passed
@Prashanth684
Copy link
Contributor

/cherry-pick release-4.16

@Prashanth684
Copy link
Contributor

/cherry-pick release-4.17

@openshift-cherrypick-robot
Copy link
Author

@Prashanth684: new pull request created: #1679

In response to this:

/cherry-pick release-4.16

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-sigs/prow repository.

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Dec 9, 2024
Open
@openshift-cherrypick-robot
Copy link
Author

@Prashanth684: #1677 failed to apply on top of branch "release-4.17":

Applying: Remove clevis overrides for OKD
Using index info to reconstruct a base tree...
M	overrides-c9s.yaml
Falling back to patching base and 3-way merge...
Auto-merging overrides-c9s.yaml
CONFLICT (content): Merge conflict in overrides-c9s.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Remove clevis overrides for OKD

In response to this:

/cherry-pick release-4.17

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-sigs/prow repository.

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

@dustymabe dustymabe dustymabe approved these changes

@c4rt0 c4rt0 Awaiting requested review from c4rt0

@ravanelli ravanelli Awaiting requested review from ravanelli

Assignees

@Prashanth684 Prashanth684

@dustymabe dustymabe

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@openshift-cherrypick-robot @Prashanth684 @dustymabe