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

🤖 Sync from open-cluster-management-io/governance-policy-propagator: #193 #585

Merged
merged 2 commits into from
Feb 21, 2024

Conversation

magic-mirror-bot[bot]
Copy link
Contributor

@magic-mirror-bot magic-mirror-bot bot commented Feb 21, 2024

This reverts commit 5375a62.

Signed-off-by: mprahl <[email protected]>
(cherry picked from commit 165d54e)
@mprahl
Copy link
Contributor

mprahl commented Feb 21, 2024

/cherry-pick release-2.9

@openshift-cherrypick-robot

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

In response to this:

/cherry-pick release-2.9

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.

@mprahl
Copy link
Contributor

mprahl commented Feb 21, 2024

/cherry-pick release-2.8

@openshift-cherrypick-robot

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

In response to this:

/cherry-pick release-2.8

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.

Copy link

Copy link

openshift-ci bot commented Feb 21, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: magic-mirror-bot[bot], mprahl

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-merge-bot openshift-merge-bot bot merged commit 6ff7dea into main Feb 21, 2024
18 checks passed
@openshift-merge-bot openshift-merge-bot bot deleted the magic-mirror-main-1708538270551 branch February 21, 2024 19:20
@openshift-cherrypick-robot

@mprahl: new pull request created: #587

In response to this:

/cherry-pick release-2.9

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

@mprahl: #585 failed to apply on top of branch "release-2.8":

Applying: Add more logging for when a placement binding can't be retrieved
Using index info to reconstruct a base tree...
M	controllers/policyset/policyset_controller.go
Falling back to patching base and 3-way merge...
Auto-merging controllers/policyset/policyset_controller.go
Applying: Revert "Fix flacky case19 e2e test issue"
Using index info to reconstruct a base tree...
A	test/e2e/case19_rep_policy_placement_test.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): test/e2e/case19_rep_policy_placement_test.go deleted in HEAD and modified in Revert "Fix flacky case19 e2e test issue". Version Revert "Fix flacky case19 e2e test issue" of test/e2e/case19_rep_policy_placement_test.go left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 Revert "Fix flacky case19 e2e test issue"
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:

/cherry-pick release-2.8

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.

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

Successfully merging this pull request may close these issues.

😿 Failed to sync the upstream PRs: #193
2 participants