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

Download subctl binary in anycase #10979

Conversation

shylesh
Copy link
Contributor

@shylesh shylesh commented Dec 4, 2024

No description provided.

@shylesh shylesh requested a review from a team as a code owner December 4, 2024 10:17
@pull-request-size pull-request-size bot added the size/M PR that changes 30-99 lines label Dec 4, 2024
@shylesh shylesh self-assigned this Dec 4, 2024
petr-balogh
petr-balogh previously approved these changes Dec 4, 2024
@openshift-ci openshift-ci bot added the lgtm label Dec 4, 2024
@shylesh shylesh force-pushed the download-subctl-submariner-deployment branch from c93c2f1 to d76e667 Compare December 4, 2024 10:33
@openshift-ci openshift-ci bot removed the lgtm label Dec 4, 2024
@shylesh shylesh force-pushed the download-subctl-submariner-deployment branch from d76e667 to 21fb2e8 Compare December 4, 2024 10:43
Signed-off-by: Shylesh Kumar Mohan <[email protected]>
@shylesh shylesh force-pushed the download-subctl-submariner-deployment branch from 21fb2e8 to 7efc8f7 Compare December 4, 2024 10:57
@shylesh
Copy link
Contributor Author

shylesh commented Dec 4, 2024

Verified as part of RDR production run verification

@shylesh shylesh added the Verified Mark when PR was verified and log provided label Dec 4, 2024
@openshift-ci openshift-ci bot added the lgtm label Dec 4, 2024
@petr-balogh
Copy link
Member

/cherry-pick release-4.17

@openshift-cherrypick-robot
Copy link
Collaborator

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

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.

@petr-balogh
Copy link
Member

/cherry-pick release-4.16

@openshift-cherrypick-robot
Copy link
Collaborator

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

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.

@petr-balogh
Copy link
Member

/cherry-pick release-4.15

@openshift-cherrypick-robot
Copy link
Collaborator

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

In response to this:

/cherry-pick release-4.15

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.

Copy link

openshift-ci bot commented Dec 4, 2024

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: dahorak, ebenahar, petr-balogh, shylesh

The full list of commands accepted by this bot can be found 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

@petr-balogh petr-balogh merged commit 2ea31e1 into red-hat-storage:master Dec 4, 2024
6 of 7 checks passed
@openshift-cherrypick-robot
Copy link
Collaborator

@petr-balogh: new pull request created: #10986

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.

@openshift-cherrypick-robot
Copy link
Collaborator

@petr-balogh: #10979 failed to apply on top of branch "release-4.16":

Applying: Download subctl binary in anycase
Using index info to reconstruct a base tree...
M	ocs_ci/deployment/acm.py
M	ocs_ci/ocs/utils.py
Falling back to patching base and 3-way merge...
Auto-merging ocs_ci/ocs/utils.py
CONFLICT (content): Merge conflict in ocs_ci/ocs/utils.py
Auto-merging ocs_ci/deployment/acm.py
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 Download subctl binary in anycase

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
Copy link
Collaborator

@petr-balogh: #10979 failed to apply on top of branch "release-4.15":

Applying: Download subctl binary in anycase
Using index info to reconstruct a base tree...
M	ocs_ci/deployment/acm.py
M	ocs_ci/ocs/utils.py
Falling back to patching base and 3-way merge...
Auto-merging ocs_ci/ocs/utils.py
CONFLICT (content): Merge conflict in ocs_ci/ocs/utils.py
Auto-merging ocs_ci/deployment/acm.py
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 Download subctl binary in anycase

In response to this:

/cherry-pick release-4.15

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
lgtm size/M PR that changes 30-99 lines Verified Mark when PR was verified and log provided
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants