Skip to content

OCPBUGS-29262-redo: Updated the vSphere add parameters to include mis… #74339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
JoeAldinger merged 1 commit into from
Apr 25, 2024
Merged

OCPBUGS-29262-redo: Updated the vSphere add parameters to include mis… #74339

JoeAldinger merged 1 commit into from
Apr 25, 2024

Conversation

@dfitzmau
Copy link
Contributor

@dfitzmau dfitzmau commented Apr 8, 2024 •
edited
Loading

@openshift-ci openshift-ci bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Apr 8, 2024
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Apr 8, 2024 •
edited
Loading

🤖 Tue Apr 23 13:55:22 - Prow CI generated the docs preview:
https://74339--ocpdocs-pr.netlify.app
Complete list of updated preview URLs: artifacts/updated_preview_urls.txt

@dfitzmau dfitzmau force-pushed the OCPBUGS-29262-redo branch 3 times, most recently from 0e3f91b to 6058701 Compare April 9, 2024 11:56
@openshift-ci openshift-ci bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 9, 2024
@dfitzmau dfitzmau force-pushed the OCPBUGS-29262-redo branch from 6058701 to bb296b1 Compare April 9, 2024 13:18
@openshift-ci openshift-ci bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Apr 9, 2024
@dfitzmau dfitzmau force-pushed the OCPBUGS-29262-redo branch 2 times, most recently from 83d4c14 to a8c3bde Compare April 9, 2024 13:42
@openshift-ci openshift-ci bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 9, 2024
ocpdocs-vale-bot
ocpdocs-vale-bot reviewed Apr 9, 2024
View reviewed changes
@dfitzmau dfitzmau force-pushed the OCPBUGS-29262-redo branch 2 times, most recently from 31c6a2f to b421c7f Compare April 9, 2024 14:00
ocpdocs-vale-bot
ocpdocs-vale-bot reviewed Apr 9, 2024
View reviewed changes
@dfitzmau dfitzmau force-pushed the OCPBUGS-29262-redo branch 2 times, most recently from a37f4e3 to 12c1941 Compare April 9, 2024 14:21
@openshift-ci openshift-ci bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Apr 9, 2024
@dfitzmau dfitzmau force-pushed the OCPBUGS-29262-redo branch 5 times, most recently from 577ea9c to c6c2ab9 Compare April 9, 2024 16:19
ocpdocs-vale-bot
ocpdocs-vale-bot reviewed Apr 9, 2024
View reviewed changes
@JoeAldinger JoeAldinger added this to the Continuous Release milestone Apr 24, 2024
JoeAldinger
JoeAldinger reviewed Apr 24, 2024
View reviewed changes
Copy link
Contributor

@JoeAldinger JoeAldinger left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Found one thing that I was unsure on and had a question about. Feel free to ping back about this.

@JoeAldinger JoeAldinger removed the merge-review-in-progress Signifies that the merge review team is reviewing this PR label Apr 24, 2024
@dfitzmau
Copy link
Contributor Author

dfitzmau commented Apr 25, 2024

/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 Apr 25, 2024
@JoeAldinger JoeAldinger 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 Apr 25, 2024
@JoeAldinger JoeAldinger self-assigned this Apr 25, 2024
@JoeAldinger JoeAldinger merged commit 2892f4f into openshift:main Apr 25, 2024
@JoeAldinger
Copy link
Contributor

JoeAldinger commented Apr 25, 2024

/cherrypick enterprise-4.16

@JoeAldinger
Copy link
Contributor

JoeAldinger commented Apr 25, 2024

/cherrypick enterprise-4.15

@JoeAldinger
Copy link
Contributor

JoeAldinger commented Apr 25, 2024

/cherrypick enterprise-4.14

@JoeAldinger
Copy link
Contributor

JoeAldinger commented Apr 25, 2024

/cherrypick enterprise-4.13

@JoeAldinger
Copy link
Contributor

JoeAldinger commented Apr 25, 2024

/cherrypick enterprise-4.12

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Apr 25, 2024
Merged
@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Apr 25, 2024

@JoeAldinger: new pull request created: #75134

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

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Apr 25, 2024

@JoeAldinger: #74339 failed to apply on top of branch "enterprise-4.14":

Applying: OCPBUGS-29262-redo: Updated the vSphere add parameters to include missing parameters
Using index info to reconstruct a base tree...
M	modules/installation-configuration-parameters.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/installation-configuration-parameters.adoc
CONFLICT (content): Merge conflict in modules/installation-configuration-parameters.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-29262-redo: Updated the vSphere add parameters to include missing parameters
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.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.

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Apr 25, 2024
Merged
@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Apr 25, 2024

@JoeAldinger: new pull request created: #75135

Details

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

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Apr 25, 2024

@JoeAldinger: #74339 failed to apply on top of branch "enterprise-4.13":

Applying: OCPBUGS-29262-redo: Updated the vSphere add parameters to include missing parameters
Using index info to reconstruct a base tree...
M	modules/installation-configuration-parameters.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/installation-configuration-parameters.adoc
CONFLICT (content): Merge conflict in modules/installation-configuration-parameters.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-29262-redo: Updated the vSphere add parameters to include missing parameters
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.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.

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Apr 25, 2024

@JoeAldinger: #74339 failed to apply on top of branch "enterprise-4.12":

Applying: OCPBUGS-29262-redo: Updated the vSphere add parameters to include missing parameters
Using index info to reconstruct a base tree...
M	modules/installation-configuration-parameters.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/installation-configuration-parameters.adoc
CONFLICT (content): Merge conflict in modules/installation-configuration-parameters.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-29262-redo: Updated the vSphere add parameters to include missing parameters
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.

@JoeAldinger JoeAldinger removed their assignment Apr 25, 2024
This was referenced Apr 25, 2024
Merged
Merged
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mburke5678 mburke5678 mburke5678 approved these changes

@bscott-rh bscott-rh bscott-rh left review comments

@JoeAldinger JoeAldinger JoeAldinger left review comments

+5 more reviewers

@rwsu rwsu rwsu left review comments

@jcpowermac jcpowermac jcpowermac left review comments

@sgaoshang sgaoshang sgaoshang left review comments

@rvanderp3 rvanderp3 rvanderp3 left review comments

@ocpdocs-vale-bot ocpdocs-vale-bot ocpdocs-vale-bot left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@jcpowermac jcpowermac

@sgaoshang sgaoshang

Labels

branch/enterprise-4.12 branch/enterprise-4.13 branch/enterprise-4.14 branch/enterprise-4.15 branch/enterprise-4.16 lgtm Indicates that a PR is ready to be merged. merge-review-in-progress Signifies that the merge review team is reviewing this PR 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

Milestone

Continuous Release

Development

Successfully merging this pull request may close these issues.