Skip to content

OCPBUGS-12930-link-fix#64296

Merged
bscott-rh merged 1 commit intoopenshift:mainfrom
dfitzmau:OCPBUGS-12930--link-fix
Sep 6, 2023
Merged

OCPBUGS-12930-link-fix#64296
bscott-rh merged 1 commit intoopenshift:mainfrom
dfitzmau:OCPBUGS-12930--link-fix

Conversation

@openshift-ci openshift-ci Bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Sep 5, 2023
@dfitzmau dfitzmau force-pushed the OCPBUGS-12930--link-fix branch from ff194c3 to d04a032 Compare September 5, 2023 13:36
@dfitzmau dfitzmau force-pushed the OCPBUGS-12930--link-fix branch from d04a032 to 6f19289 Compare September 5, 2023 13:54
@ocpdocs-previewbot
Copy link
Copy Markdown

@dfitzmau
Copy link
Copy Markdown
Contributor Author

dfitzmau commented Sep 5, 2023

/label peer-review-needed

@openshift-ci openshift-ci Bot added the peer-review-needed Signifies that the peer review team needs to review this PR label Sep 5, 2023
@skopacz1
Copy link
Copy Markdown
Contributor

skopacz1 commented Sep 5, 2023

/label peer-review-in-progress

@openshift-ci openshift-ci Bot added the peer-review-in-progress Signifies that the peer review team is reviewing this PR label Sep 5, 2023
Copy link
Copy Markdown
Contributor

@skopacz1 skopacz1 left a comment

Choose a reason for hiding this comment

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

LGTM

@skopacz1
Copy link
Copy Markdown
Contributor

skopacz1 commented Sep 5, 2023

/remove-label peer-review-needed
/remove-label peer-review-in-progress

/label peer-review-done

@openshift-ci openshift-ci Bot added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-needed Signifies that the peer review team needs to review this PR peer-review-in-progress Signifies that the peer review team is reviewing this PR labels Sep 5, 2023
@dfitzmau
Copy link
Copy Markdown
Contributor Author

dfitzmau commented Sep 6, 2023

/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 Sep 6, 2023
@bscott-rh bscott-rh added merge-review-in-progress Signifies that the merge review team is reviewing this PR branch/enterprise-4.10 branch/enterprise-4.11 branch/enterprise-4.12 branch/enterprise-4.13 branch/enterprise-4.14 and removed merge-review-needed Signifies that the merge review team needs to review this PR labels Sep 6, 2023
@bscott-rh bscott-rh added this to the Continuous Release milestone Sep 6, 2023
@bscott-rh
Copy link
Copy Markdown
Contributor

LGTM.

@bscott-rh bscott-rh removed the merge-review-in-progress Signifies that the merge review team is reviewing this PR label Sep 6, 2023
@bscott-rh bscott-rh merged commit 240107f into openshift:main Sep 6, 2023
@bscott-rh
Copy link
Copy Markdown
Contributor

/cherrypick enterprise-4.10

@openshift-cherrypick-robot
Copy link
Copy Markdown

@bscott-rh: #64296 failed to apply on top of branch "enterprise-4.10":

Applying: OCPBUGS-12930-link-fix
Using index info to reconstruct a base tree...
M	installing/installing_aws/installing-restricted-networks-aws.adoc
M	installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc
M	installing/installing_gcp/installing-restricted-networks-gcp-installer-provisioned.adoc
M	installing/installing_gcp/installing-restricted-networks-gcp.adoc
M	installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc
A	installing/installing_ibm_powervs/installing-restricted-networks-ibm-power-vs.adoc
M	installing/installing_ibm_z/installing-restricted-networks-ibm-z-kvm.adoc
M	installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc
A	installing/installing_nutanix/installing-restricted-networks-nutanix-installer-provisioned.adoc
M	installing/installing_openstack/installing-openstack-installer-restricted.adoc
M	installing/installing_vsphere/installing-restricted-networks-installer-provisioned-vsphere.adoc
Falling back to patching base and 3-way merge...
Auto-merging installing/installing_vsphere/installing-restricted-networks-installer-provisioned-vsphere.adoc
Auto-merging installing/installing_openstack/installing-openstack-installer-restricted.adoc
CONFLICT (modify/delete): installing/installing_nutanix/installing-restricted-networks-nutanix-installer-provisioned.adoc deleted in HEAD and modified in OCPBUGS-12930-link-fix. Version OCPBUGS-12930-link-fix of installing/installing_nutanix/installing-restricted-networks-nutanix-installer-provisioned.adoc left in tree.
Auto-merging installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc
Auto-merging installing/installing_ibm_z/installing-restricted-networks-ibm-z-kvm.adoc
CONFLICT (modify/delete): installing/installing_ibm_powervs/installing-restricted-networks-ibm-power-vs.adoc deleted in HEAD and modified in OCPBUGS-12930-link-fix. Version OCPBUGS-12930-link-fix of installing/installing_ibm_powervs/installing-restricted-networks-ibm-power-vs.adoc left in tree.
Auto-merging installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc
Auto-merging installing/installing_gcp/installing-restricted-networks-gcp.adoc
Auto-merging installing/installing_gcp/installing-restricted-networks-gcp-installer-provisioned.adoc
Auto-merging installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc
Auto-merging installing/installing_aws/installing-restricted-networks-aws.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OCPBUGS-12930-link-fix
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".

Details

In response to this:

/cherrypick enterprise-4.10

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/test-infra repository.

@bscott-rh
Copy link
Copy Markdown
Contributor

/cherrypick enterprise-4.11

@openshift-cherrypick-robot
Copy link
Copy Markdown

@bscott-rh: #64296 failed to apply on top of branch "enterprise-4.11":

Applying: OCPBUGS-12930-link-fix
Using index info to reconstruct a base tree...
M	installing/installing_aws/installing-restricted-networks-aws.adoc
M	installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc
M	installing/installing_gcp/installing-restricted-networks-gcp-installer-provisioned.adoc
M	installing/installing_gcp/installing-restricted-networks-gcp.adoc
M	installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc
A	installing/installing_ibm_powervs/installing-restricted-networks-ibm-power-vs.adoc
M	installing/installing_ibm_z/installing-restricted-networks-ibm-z-kvm.adoc
M	installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc
A	installing/installing_nutanix/installing-restricted-networks-nutanix-installer-provisioned.adoc
M	installing/installing_openstack/installing-openstack-installer-restricted.adoc
M	installing/installing_vsphere/installing-restricted-networks-installer-provisioned-vsphere.adoc
Falling back to patching base and 3-way merge...
Auto-merging installing/installing_vsphere/installing-restricted-networks-installer-provisioned-vsphere.adoc
Auto-merging installing/installing_openstack/installing-openstack-installer-restricted.adoc
CONFLICT (modify/delete): installing/installing_nutanix/installing-restricted-networks-nutanix-installer-provisioned.adoc deleted in HEAD and modified in OCPBUGS-12930-link-fix. Version OCPBUGS-12930-link-fix of installing/installing_nutanix/installing-restricted-networks-nutanix-installer-provisioned.adoc left in tree.
Auto-merging installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc
Auto-merging installing/installing_ibm_z/installing-restricted-networks-ibm-z-kvm.adoc
CONFLICT (modify/delete): installing/installing_ibm_powervs/installing-restricted-networks-ibm-power-vs.adoc deleted in HEAD and modified in OCPBUGS-12930-link-fix. Version OCPBUGS-12930-link-fix of installing/installing_ibm_powervs/installing-restricted-networks-ibm-power-vs.adoc left in tree.
Auto-merging installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc
Auto-merging installing/installing_gcp/installing-restricted-networks-gcp.adoc
Auto-merging installing/installing_gcp/installing-restricted-networks-gcp-installer-provisioned.adoc
Auto-merging installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc
Auto-merging installing/installing_aws/installing-restricted-networks-aws.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OCPBUGS-12930-link-fix
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".

Details

In response to this:

/cherrypick enterprise-4.11

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/test-infra repository.

@bscott-rh
Copy link
Copy Markdown
Contributor

/cherrypick enterprise-4.12

@openshift-cherrypick-robot
Copy link
Copy Markdown

@bscott-rh: #64296 failed to apply on top of branch "enterprise-4.12":

Applying: OCPBUGS-12930-link-fix
Using index info to reconstruct a base tree...
M	installing/installing_aws/installing-restricted-networks-aws.adoc
M	installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc
M	installing/installing_gcp/installing-restricted-networks-gcp-installer-provisioned.adoc
M	installing/installing_gcp/installing-restricted-networks-gcp.adoc
M	installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc
A	installing/installing_ibm_powervs/installing-restricted-networks-ibm-power-vs.adoc
M	installing/installing_ibm_z/installing-restricted-networks-ibm-z-kvm.adoc
M	installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc
M	installing/installing_vsphere/installing-restricted-networks-installer-provisioned-vsphere.adoc
Falling back to patching base and 3-way merge...
Auto-merging installing/installing_vsphere/installing-restricted-networks-installer-provisioned-vsphere.adoc
Auto-merging installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc
Auto-merging installing/installing_ibm_z/installing-restricted-networks-ibm-z-kvm.adoc
CONFLICT (modify/delete): installing/installing_ibm_powervs/installing-restricted-networks-ibm-power-vs.adoc deleted in HEAD and modified in OCPBUGS-12930-link-fix. Version OCPBUGS-12930-link-fix of installing/installing_ibm_powervs/installing-restricted-networks-ibm-power-vs.adoc left in tree.
Auto-merging installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc
Auto-merging installing/installing_gcp/installing-restricted-networks-gcp.adoc
Auto-merging installing/installing_gcp/installing-restricted-networks-gcp-installer-provisioned.adoc
Auto-merging installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc
Auto-merging installing/installing_aws/installing-restricted-networks-aws.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OCPBUGS-12930-link-fix
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".

Details

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/test-infra repository.

@bscott-rh
Copy link
Copy Markdown
Contributor

/cherrypick enterprise-4.13

@openshift-cherrypick-robot
Copy link
Copy Markdown

@bscott-rh: new pull request created: #64367

Details

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/test-infra repository.

@bscott-rh
Copy link
Copy Markdown
Contributor

/cherrypick enterprise-4.14

@openshift-cherrypick-robot
Copy link
Copy Markdown

@bscott-rh: new pull request created: #64368

Details

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/test-infra repository.

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

Labels

branch/enterprise-4.10 branch/enterprise-4.11 branch/enterprise-4.12 branch/enterprise-4.13 branch/enterprise-4.14 peer-review-done Signifies that the peer review team has reviewed this PR size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants