Skip to content

Compose rdr_ui marker with skipif #12056

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

Merged

Conversation

petr-balogh
Copy link
Member

No description provided.

@petr-balogh petr-balogh requested a review from a team as a code owner May 5, 2025 09:54
@petr-balogh
Copy link
Member Author

Verification job:
https://url.corp.redhat.com/d1f277a

Copy link

openshift-ci bot commented May 5, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: am-agrawa, petr-balogh, vavuthu

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 added the Verified Mark when PR was verified and log provided label May 7, 2025
@petr-balogh petr-balogh merged commit 8ac5d64 into red-hat-storage:release-4.18 May 7, 2025
6 of 7 checks passed
@petr-balogh
Copy link
Member Author

/cherry-pick release-4.18

@openshift-cherrypick-robot
Copy link
Collaborator

@petr-balogh: I cannot cherry-pick the present PR on top of its base branch (release-4.18).

In response to this:

/cherry-pick release-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.

@petr-balogh
Copy link
Member Author

/cherry-pick release-4.17

@petr-balogh
Copy link
Member Author

/cherry-pick release-4.16

@openshift-cherrypick-robot
Copy link
Collaborator

@petr-balogh: #12056 failed to apply on top of branch "release-4.17":

Applying: Compose rdr_ui marker with skipif
Using index info to reconstruct a base tree...
M	ocs_ci/framework/pytest_customization/marks.py
Falling back to patching base and 3-way merge...
Auto-merging ocs_ci/framework/pytest_customization/marks.py
CONFLICT (content): Merge conflict in ocs_ci/framework/pytest_customization/marks.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 Compose rdr_ui marker with skipif

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: #12056 failed to apply on top of branch "release-4.16":

Applying: Compose rdr_ui marker with skipif
Using index info to reconstruct a base tree...
M	ocs_ci/framework/pytest_customization/marks.py
Falling back to patching base and 3-way merge...
Auto-merging ocs_ci/framework/pytest_customization/marks.py
CONFLICT (content): Merge conflict in ocs_ci/framework/pytest_customization/marks.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 Compose rdr_ui marker with skipif

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 Author

/cherry-pick master

@openshift-cherrypick-robot
Copy link
Collaborator

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

In response to this:

/cherry-pick master

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/XS Verified Mark when PR was verified and log provided
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants