Skip to content

Conversation

abrennan89
Copy link
Contributor

@abrennan89 abrennan89 commented Jul 26, 2024

@openshift-ci openshift-ci bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jul 26, 2024
@abrennan89 abrennan89 changed the title [WIP] Move scattered postinstall content to image config section and remove unpublished content [WIP] OCPBUGS-30108: Move scattered postinstall content to image config section and remove unpublished content Jul 30, 2024
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jul 30, 2024
@openshift-ci-robot
Copy link

@abrennan89: This pull request references Jira Issue OCPBUGS-30108, which is invalid:

  • expected the bug to target the "4.17.0" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

Version(s):

Issue:

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 30, 2024
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 31, 2024
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Jul 31, 2024

🤖 Thu Aug 01 19:23:25 - Prow CI generated the docs preview:
https://79596--ocpdocs-pr.netlify.app
Complete list of updated preview URLs: artifacts/updated_preview_urls.txt

@abrennan89 abrennan89 changed the title [WIP] OCPBUGS-30108: Move scattered postinstall content to image config section and remove unpublished content OCPBUGS-30108: Move scattered postinstall content to image config section and remove unpublished content Jul 31, 2024
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 31, 2024
@abrennan89 abrennan89 added this to the Continuous Release milestone Jul 31, 2024
@abrennan89 abrennan89 added the peer-review-needed Signifies that the peer review team needs to review this PR label Jul 31, 2024
@lpettyjo lpettyjo added peer-review-in-progress Signifies that the peer review team is reviewing this PR and removed peer-review-needed Signifies that the peer review team needs to review this PR labels Aug 1, 2024
@lpettyjo lpettyjo self-requested a review August 1, 2024 13:25
Copy link
Contributor

@lpettyjo lpettyjo left a comment

Choose a reason for hiding this comment

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

LGTM!

@lpettyjo lpettyjo added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-in-progress Signifies that the peer review team is reviewing this PR labels Aug 1, 2024
Copy link

openshift-ci bot commented Aug 1, 2024

@abrennan89: all tests passed!

Full PR test history. Your PR dashboard.

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.

@abrennan89 abrennan89 merged commit 48e8a97 into openshift:main Aug 1, 2024
@openshift-ci-robot
Copy link

@abrennan89: Jira Issue OCPBUGS-30108 is in an unrecognized state (Verified) and will not be moved to the MODIFIED state.

In response to this:

Version(s):
4.12+

Issue:
https://issues.redhat.com/browse/OCPBUGS-30108

Link to docs preview:

QE review:

  • N/A, structural changes only

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 openshift-eng/jira-lifecycle-plugin repository.

@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.17

@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.16

@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.15

@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.14

@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.13

@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.12

@openshift-cherrypick-robot

@abrennan89: new pull request created: #79886

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

@abrennan89: new pull request created: #79887

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.

@openshift-cherrypick-robot

@abrennan89: new pull request created: #79888

In response to this:

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

@openshift-cherrypick-robot

@abrennan89: new pull request created: #79889

In response to this:

/cherrypick enterprise-4.14

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

@abrennan89: #79596 failed to apply on top of branch "enterprise-4.13":

Applying: Move scattered postinstall content to image config section
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
M	modules/images-configuration-file.adoc
M	modules/images-configuration-registry-mirror-configuring.adoc
M	modules/images-configuration-registry-mirror-convert.adoc
M	modules/images-configuration-registry-mirror.adoc
M	modules/images-update-global-pull-secret.adoc
M	post_installation_configuration/cluster-tasks.adoc
M	post_installation_configuration/preparing-for-users.adoc
Falling back to patching base and 3-way merge...
Auto-merging post_installation_configuration/preparing-for-users.adoc
Auto-merging post_installation_configuration/cluster-tasks.adoc
CONFLICT (content): Merge conflict in post_installation_configuration/cluster-tasks.adoc
Auto-merging modules/images-update-global-pull-secret.adoc
CONFLICT (content): Merge conflict in modules/images-update-global-pull-secret.adoc
Auto-merging modules/images-configuration-registry-mirror.adoc
CONFLICT (content): Merge conflict in modules/images-configuration-registry-mirror.adoc
Auto-merging modules/images-configuration-registry-mirror-convert.adoc
CONFLICT (content): Merge conflict in modules/images-configuration-registry-mirror-convert.adoc
Auto-merging modules/images-configuration-registry-mirror-configuring.adoc
Auto-merging modules/images-configuration-file.adoc
Auto-merging _topic_maps/_topic_map.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Move scattered postinstall content to image config section
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick enterprise-4.13

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

@abrennan89: #79596 failed to apply on top of branch "enterprise-4.12":

Applying: Move scattered postinstall content to image config section
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
M	modules/images-configuration-cas.adoc
M	modules/images-configuration-file.adoc
A	modules/images-configuration-registry-mirror-configuring.adoc
A	modules/images-configuration-registry-mirror-convert.adoc
M	modules/images-configuration-registry-mirror.adoc
M	modules/images-update-global-pull-secret.adoc
M	post_installation_configuration/cluster-tasks.adoc
M	post_installation_configuration/preparing-for-users.adoc
Falling back to patching base and 3-way merge...
Auto-merging post_installation_configuration/preparing-for-users.adoc
CONFLICT (content): Merge conflict in post_installation_configuration/preparing-for-users.adoc
Auto-merging post_installation_configuration/cluster-tasks.adoc
CONFLICT (content): Merge conflict in post_installation_configuration/cluster-tasks.adoc
Auto-merging modules/images-update-global-pull-secret.adoc
CONFLICT (content): Merge conflict in modules/images-update-global-pull-secret.adoc
Auto-merging modules/images-configuration-registry-mirror.adoc
CONFLICT (content): Merge conflict in modules/images-configuration-registry-mirror.adoc
CONFLICT (modify/delete): modules/images-configuration-registry-mirror-convert.adoc deleted in HEAD and modified in Move scattered postinstall content to image config section. Version Move scattered postinstall content to image config section of modules/images-configuration-registry-mirror-convert.adoc left in tree.
CONFLICT (modify/delete): modules/images-configuration-registry-mirror-configuring.adoc deleted in HEAD and modified in Move scattered postinstall content to image config section. Version Move scattered postinstall content to image config section of modules/images-configuration-registry-mirror-configuring.adoc left in tree.
Auto-merging modules/images-configuration-file.adoc
Auto-merging modules/images-configuration-cas.adoc
Auto-merging _topic_maps/_topic_map.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Move scattered postinstall content to image config section
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick enterprise-4.12

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

branch/enterprise-4.12 branch/enterprise-4.13 branch/enterprise-4.14 branch/enterprise-4.15 branch/enterprise-4.16 branch/enterprise-4.17 jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. peer-review-done Signifies that the peer review team has reviewed this PR size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants