Skip to content

Conversation

@DanielOsypenko
Copy link
Contributor

cherry-pick from merged #11835 has failed to rebase, I separated manually necessary changes to avoid failure:

2025-10-16 12:21:44      def create_image_override(self):
2025-10-16 12:21:44          """
2025-10-16 12:21:44          Create hypershift image override cm
2025-10-16 12:21:44          """
2025-10-16 12:21:44          # Create image override configmap using the image override json
2025-10-16 12:21:44          cmd = (
2025-10-16 12:21:44              f"oc create cm {self.hypershift_override_image_cm} --from-file={constants.IMAGE_OVERRIDE_JSON} "
2025-10-16 12:21:44              f"-n {self.mce_namespace}"
2025-10-16 12:21:44          )
2025-10-16 12:21:44          cmd_res = exec_cmd(cmd, shell=True)
2025-10-16 12:21:44          if cmd_res.returncode:
2025-10-16 12:21:44              raise CommandFailed("override configmap not created successfully")
2025-10-16 12:21:44      
2025-10-16 12:21:44          # annotate multicluster engine operator with the override cm
2025-10-16 12:21:44          self.multicluster_engine.annotate(
2025-10-16 12:21:44              annotation=f"imageOverridesCM={self.hypershift_override_image_cm}"
2025-10-16 12:21:44          )
2025-10-16 12:21:44  >       self.multicluster_engine.wait_until_running()
2025-10-16 12:21:44  E       AttributeError: 'OCP' object has no attribute 'wait_until_running'
2025-10-16 12:21:44  
2025-10-16 12:21:44  ocs_ci/deployment/mce.py:227: AttributeError

@DanielOsypenko DanielOsypenko self-assigned this Oct 16, 2025
@DanielOsypenko DanielOsypenko added the provider mode deployment Issues preventing Provider mode deployments on any stage label Oct 16, 2025
@DanielOsypenko DanielOsypenko requested a review from a team as a code owner October 16, 2025 12:29
@pull-request-size pull-request-size bot added the size/M PR that changes 30-99 lines label Oct 16, 2025
Signed-off-by: Daniel Osypenko <[email protected]>
@DanielOsypenko
Copy link
Contributor Author

/cherry-pick release-4.17

@openshift-cherrypick-robot
Copy link
Collaborator

@DanielOsypenko: 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.

@openshift-ci
Copy link

openshift-ci bot commented Oct 22, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: DanielOsypenko, fbalak, suchita-g

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

@fbalak fbalak merged commit eaeb6ed into red-hat-storage:release-4.18 Oct 22, 2025
5 of 6 checks passed
@openshift-cherrypick-robot
Copy link
Collaborator

@DanielOsypenko: #13401 failed to apply on top of branch "release-4.17":

Applying: copy-pick mce deployment fix 418
Using index info to reconstruct a base tree...
A	ocs_ci/deployment/mce.py
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): ocs_ci/deployment/mce.py deleted in HEAD and modified in copy-pick mce deployment fix 418. Version copy-pick mce deployment fix 418 of ocs_ci/deployment/mce.py left in tree.
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 copy-pick mce deployment fix 418

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.

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

Labels

lgtm provider mode deployment Issues preventing Provider mode deployments on any stage size/M PR that changes 30-99 lines

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants