Skip to content
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

HCIDOCS-474-OCI: AI installation on OCI bare metal #82685

Merged
merged 1 commit into from
Dec 24, 2024
Merged

HCIDOCS-474-OCI: AI installation on OCI bare metal #82685

merged 1 commit into from
Dec 24, 2024

Conversation

tshwartz
Copy link
Contributor

@tshwartz tshwartz commented Sep 29, 2024 •
edited
Loading

Summary of change:

  • Updated the Integration with OCI chapter to include the new bare metal support.
  • Reorganized and edited the procedures in that chapter to make it easier to follow.

Version(s):
4.17, 4.18, main

Issue:
https://issues.redhat.com/browse/HCIDOCS-474

SMEs: Marcos Entenza Garcia, Adrien Gentil
QE: Benny Kopilov

QE review:

  • QE has approved this change.

Additional information:

@openshift-ci openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Sep 29, 2024
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Sep 29, 2024 •
edited
Loading

🤖 Tue Dec 24 11:12:48 - Prow CI generated the docs preview:

https://82685--ocpdocs-pr.netlify.app/
https://82685--ocpdocs-pr.netlify.app/openshift-enterprise/latest/installing/installing_oci/installing-oci-assisted-installer.html

@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 Oct 7, 2024
@tshwartz tshwartz force-pushed the HCIDOCS-474-OCI branch 3 times, most recently from 7a55d39 to c5a3675 Compare October 9, 2024 13:00
@tshwartz tshwartz marked this pull request as draft October 9, 2024 15:51
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 9, 2024
@openshift-ci openshift-ci bot added the merge-review-needed Signifies that the merge review team needs to review this PR label Dec 24, 2024
@tshwartz
Copy link
Contributor Author

Please wait with merge. Just squashing commits.

@xenolinux xenolinux added merge-review-in-progress Signifies that the merge review team is reviewing this PR branch/enterprise-4.16 branch/enterprise-4.17 branch/enterprise-4.18 and removed merge-review-needed Signifies that the merge review team needs to review this PR labels Dec 24, 2024
@xenolinux xenolinux added this to the Continuous Release milestone Dec 24, 2024
@xenolinux
Copy link
Contributor

As discussed on the slack, keeping the merge-review-in-progress label as it is for now till the remaining comments are addressed. Thanks!

@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Dec 24, 2024

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

@tshwartz
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 Dec 24, 2024
@xenolinux xenolinux removed the merge-review-needed Signifies that the merge review team needs to review this PR label Dec 24, 2024
xenolinux
xenolinux reviewed Dec 24, 2024
View reviewed changes
Copy link
Contributor

@xenolinux xenolinux left a comment

Choose a reason for hiding this comment

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

Thanks for addressing all of the peer review comments!

Merging...

@xenolinux xenolinux merged commit e8fe6f3 into openshift:main Dec 24, 2024
2 checks passed
@xenolinux
Copy link
Contributor

/cherrypick enterprise-4.16

@xenolinux
Copy link
Contributor

/cherrypick enterprise-4.17

@xenolinux
Copy link
Contributor

/cherrypick enterprise-4.18

@openshift-cherrypick-robot
Copy link

@xenolinux: new pull request created: #86606

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
Copy link

@xenolinux: #82685 failed to apply on top of branch "enterprise-4.16":

Applying: HCIDOCS-474-OCI: AI installation on OCI bare metal
.git/rebase-apply/patch:52: trailing whitespace.
Create the cluster configuration and generate the discovery ISO image in the {ai-full} web console. 
.git/rebase-apply/patch:56: trailing whitespace.
* You created a child compartment and an object storage bucket on {oci}. For details, see _Preparing the {oci} environment_. 
.git/rebase-apply/patch:57: trailing whitespace.
* You reviewed details about the {product-title} installation and update processes. 
.git/rebase-apply/patch:102: trailing whitespace.
Add the mandatory custom manifests provided by Oracle. For details, see link:https://github.com/dfoster-oracle/oci-openshift/blob/v1.0.0-release-preview/custom_manifests/README.md[Custom Manifests (Oracle documentation).] 
.git/rebase-apply/patch:106: trailing whitespace.
* You copied the `dynamic_custom_manifest.yml` file from the Terraform stack in {oci}. For details, see "Provisioning {oci} infrastructure for your cluster". 
warning: squelched 28 whitespace errors
warning: 33 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	modules/using-assisted-installer-oci-agent-iso.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/using-assisted-installer-oci-agent-iso.adoc
CONFLICT (content): Merge conflict in modules/using-assisted-installer-oci-agent-iso.adoc
Removing modules/complete-assisted-installer-oci.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 advice.mergeConflict false"
Patch failed at 0001 HCIDOCS-474-OCI: AI installation on OCI bare metal

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 openshift-cherrypick-robot mentioned this pull request Dec 24, 2024
Merged
@openshift-cherrypick-robot
Copy link

@xenolinux: #82685 failed to apply on top of branch "enterprise-4.18":

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 advice.mergeConflict false"

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.

@xenolinux
Copy link
Contributor

/cherrypick enterprise-4.18

@openshift-cherrypick-robot
Copy link

@xenolinux: new pull request created: #86607

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 openshift-cherrypick-robot mentioned this pull request Dec 24, 2024
Merged
@xenolinux xenolinux removed the merge-review-in-progress Signifies that the merge review team is reviewing this PR label Dec 24, 2024
@tshwartz tshwartz mentioned this pull request Dec 25, 2024
Merged
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

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

@jeana-redhat jeana-redhat jeana-redhat left review comments

@xenolinux xenolinux xenolinux left review comments

@adriengentil adriengentil adriengentil left review comments

Assignees

@adriengentil adriengentil

Labels
branch/enterprise-4.16 branch/enterprise-4.17 branch/enterprise-4.18 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.
8 participants
@tshwartz @ocpdocs-previewbot @adriengentil @bkopilov @xenolinux @openshift-cherrypick-robot @jeana-redhat @ocpdocs-vale-bot