search

red-hat-storage / ocs-ci

https://ocs-ci.readthedocs.io/en/latest/
MIT License
108 stars 168 forks source link

IBM Cloud node stop and start added (#10707) #10901

Closed petr-balogh closed 4 days ago

petr-balogh commented 4 days ago
petr-balogh commented 4 days ago

/cherry-pick release-4.16

openshift-cherrypick-robot commented 4 days ago

@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](https://github.com/red-hat-storage/ocs-ci/pull/10901#issuecomment-2489051919): >/cherry-pick release-4.16 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.
openshift-ci[bot] commented 4 days ago

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: OdedViner, petr-balogh

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

Needs approval from an approver in each of these files: - **[OWNERS](https://github.com/red-hat-storage/ocs-ci/blob/release-4.17/OWNERS)** Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
openshift-cherrypick-robot commented 4 days ago

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

Applying: IBM Cloud node stop and start added (#10707)
Using index info to reconstruct a base tree...
M   ocs_ci/ocs/platform_nodes.py
M   ocs_ci/utility/ibmcloud.py
M   tests/functional/object/mcg/ui/test_mcg_ui.py
M   tests/functional/object/mcg/ui/test_namespace_store.py
M   tests/functional/z_cluster/nodes/test_check_pods_status_after_node_failure.py
Falling back to patching base and 3-way merge...
Auto-merging tests/functional/z_cluster/nodes/test_check_pods_status_after_node_failure.py
Auto-merging tests/functional/object/mcg/ui/test_namespace_store.py
CONFLICT (content): Merge conflict in tests/functional/object/mcg/ui/test_namespace_store.py
Auto-merging tests/functional/object/mcg/ui/test_mcg_ui.py
CONFLICT (content): Merge conflict in tests/functional/object/mcg/ui/test_mcg_ui.py
Auto-merging ocs_ci/utility/ibmcloud.py
CONFLICT (content): Merge conflict in ocs_ci/utility/ibmcloud.py
Auto-merging ocs_ci/ocs/platform_nodes.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 IBM Cloud node stop and start added (#10707)
In response to [this](https://github.com/red-hat-storage/ocs-ci/pull/10901#issuecomment-2489051919): >/cherry-pick release-4.16 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.