Skip to content

[openshift-4.19] Do not trigger rebuilds for pinned rpm #6681

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

Conversation

openshift-cherrypick-robot

This is an automated cherry-pick of #6680

/assign mbiarnes

@openshift-cherrypick-robot openshift-cherrypick-robot force-pushed the cherry-pick-6680-to-openshift-4.19 branch from f9be020 to cf90928 Compare April 29, 2025 07:58
@mbiarnes
Copy link
Contributor

/lgtm
/approve
/cherrypick openshift-4.18

@openshift-cherrypick-robot
Copy link
Author

@mbiarnes: once the present PR merges, I will cherry-pick it on top of openshift-4.18 in a new PR and assign it to you.

In response to this:

/lgtm
/approve
/cherrypick openshift-4.18

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-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 29, 2025
Copy link
Contributor

openshift-ci bot commented Apr 29, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mbiarnes

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 Apr 29, 2025
@mbiarnes mbiarnes added the acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. label Apr 29, 2025
@openshift-merge-bot openshift-merge-bot bot merged commit 4c8c092 into openshift-eng:openshift-4.19 Apr 29, 2025
2 checks passed
@openshift-cherrypick-robot
Copy link
Author

@mbiarnes: #6681 failed to apply on top of branch "openshift-4.18":

Applying: Do not trigger rebuilds for pinned rpm
Using index info to reconstruct a base tree...
M	images/ose-frr.yml
Falling back to patching base and 3-way merge...
Auto-merging images/ose-frr.yml
CONFLICT (content): Merge conflict in images/ose-frr.yml
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 Do not trigger rebuilds for pinned rpm

In response to this:

/lgtm
/approve
/cherrypick openshift-4.18

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
Labels
acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. approved Indicates a PR has been approved by an approver from all required OWNERS files. 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