Skip to content

OSDOCS#18684: CQA remediation for MicroShift RPM OSTree installation#108267

Merged
bergerhoffer merged 1 commit intoopenshift:enterprise-4.19from
bergerhoffer:OSDOCS-18684-remediation
Mar 17, 2026
Merged

OSDOCS#18684: CQA remediation for MicroShift RPM OSTree installation#108267
bergerhoffer merged 1 commit intoopenshift:enterprise-4.19from
bergerhoffer:OSDOCS-18684-remediation

Conversation

@openshift-ci openshift-ci bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Mar 12, 2026
@ocpdocs-previewbot
Copy link

@openshift-ci
Copy link

openshift-ci bot commented Mar 12, 2026

@bergerhoffer: all tests passed!

Full PR test history. Your PR dashboard.

Details

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. I understand the commands that are listed here.

@bergerhoffer
Copy link
Contributor Author

/label merge-review-needed

@openshift-ci openshift-ci bot added the merge-review-needed Signifies that the merge review team needs to review this PR label Mar 12, 2026
@lahinson lahinson added merge-review-in-progress Signifies that the merge review team is reviewing this PR and removed merge-review-needed Signifies that the merge review team needs to review this PR labels Mar 16, 2026
Copy link
Contributor

@lahinson lahinson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@lahinson lahinson added ok-to-merge and removed merge-review-in-progress Signifies that the merge review team is reviewing this PR labels Mar 16, 2026
@bergerhoffer bergerhoffer merged commit 2f751bb into openshift:enterprise-4.19 Mar 17, 2026
2 checks passed
@bergerhoffer
Copy link
Contributor Author

/cherrypick enterprise-4.18

@bergerhoffer
Copy link
Contributor Author

/cherrypick enterprise-4.17

@bergerhoffer
Copy link
Contributor Author

/cherrypick enterprise-4.16

@openshift-cherrypick-robot

@bergerhoffer: #108267 failed to apply on top of branch "enterprise-4.18":

Applying: OSDOCS#18684: CQA remediation for MicroShift RPM OSTree installation
Using index info to reconstruct a base tree...
M	modules/microshift-embed-microshift-image-offline-deploy.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/microshift-embed-microshift-image-offline-deploy.adoc
CONFLICT (content): Merge conflict in modules/microshift-embed-microshift-image-offline-deploy.adoc
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 set advice.mergeConflict false"
Patch failed at 0001 OSDOCS#18684: CQA remediation for MicroShift RPM OSTree installation

Details

In response to this:

/cherrypick enterprise-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.

@openshift-cherrypick-robot

@bergerhoffer: #108267 failed to apply on top of branch "enterprise-4.17":

Patch is empty.
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 record the empty patch as an empty commit, run "git am --allow-empty".
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"

Details

In response to this:

/cherrypick enterprise-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

@bergerhoffer: #108267 failed to apply on top of branch "enterprise-4.16":

Applying: OSDOCS#18684: CQA remediation for MicroShift RPM OSTree installation
Using index info to reconstruct a base tree...
M	modules/microshift-embed-microshift-image-offline-deploy.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/microshift-embed-microshift-image-offline-deploy.adoc
CONFLICT (content): Merge conflict in modules/microshift-embed-microshift-image-offline-deploy.adoc
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 set advice.mergeConflict false"
Patch failed at 0001 OSDOCS#18684: CQA remediation for MicroShift RPM OSTree installation

Details

In response to this:

/cherrypick enterprise-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.

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.

4 participants