Skip to content

[OCPBUGS-112344]: Clarifying IBM Z and IBM Power info in HCP support matrix - #118821

Merged
lahinson merged 1 commit into
openshift:mainfrom
lahinson:ocpbugs-112344-hcp-support-matrix-multiarch
Aug 26, 2026
Merged

[OCPBUGS-112344]: Clarifying IBM Z and IBM Power info in HCP support matrix#118821
lahinson merged 1 commit into
openshift:mainfrom
lahinson:ocpbugs-112344-hcp-support-matrix-multiarch

Conversation

@lahinson

@lahinson lahinson commented Aug 25, 2026

Copy link
Copy Markdown
Contributor

@@ -233,21 +230,11 @@ The following tables indicate the supported architectures for {hcp}, organized b
|ARM64
|4.21 - 4.22

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Removed the following lines because HCP on IBM Power does not support nodes on 64_bit x86 architecture.

|64-bit x86
|ppc64le
|4.18 - 4.22

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Removed the following lines because HCP on IBM Z does not support nodes on 64-bit x86 architecture.

@ocpdocs-previewbot

Copy link
Copy Markdown

@openshift-ci

openshift-ci Bot commented Aug 25, 2026

Copy link
Copy Markdown

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

|64-bit x86
|ppc64le
|4.18 - 4.22

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Are any other combinations supported for HCP on IBM Power? For example, can the control plane be s390x and the nodes be ppc64le?

@jpattara

Copy link
Copy Markdown

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Aug 26, 2026
@lahinson
lahinson merged commit de85770 into openshift:main Aug 26, 2026
2 checks passed
@lahinson

Copy link
Copy Markdown
Contributor Author

/cherrypick enterprise-5.0

@lahinson

Copy link
Copy Markdown
Contributor Author

/cherrypick enterprise-4.22

@lahinson

Copy link
Copy Markdown
Contributor Author

/cherrypick enterprise-4.21

@lahinson

Copy link
Copy Markdown
Contributor Author

/cherrypick enterprise-4.20

@lahinson

Copy link
Copy Markdown
Contributor Author

/cherrypick enterprise-4.19

@openshift-cherrypick-robot

Copy link
Copy Markdown

@lahinson: new pull request created: #118901

Details

In response to this:

/cherrypick enterprise-5.0

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

@lahinson: #118821 failed to apply on top of branch "enterprise-4.21":

Applying: Clarifying IBM Z and IBM Power info in HCP support matrix
Using index info to reconstruct a base tree...
M	modules/hcp-support-matrix.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/hcp-support-matrix.adoc
CONFLICT (content): Merge conflict in modules/hcp-support-matrix.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 Clarifying IBM Z and IBM Power info in HCP support matrix

Details

In response to this:

/cherrypick enterprise-4.21

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

@lahinson: #118821 failed to apply on top of branch "enterprise-4.20":

Applying: Clarifying IBM Z and IBM Power info in HCP support matrix
Using index info to reconstruct a base tree...
M	modules/hcp-support-matrix.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/hcp-support-matrix.adoc
CONFLICT (content): Merge conflict in modules/hcp-support-matrix.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 Clarifying IBM Z and IBM Power info in HCP support matrix

Details

In response to this:

/cherrypick enterprise-4.20

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

@lahinson: new pull request created: #118902

Details

In response to this:

/cherrypick enterprise-4.22

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

@lahinson: #118821 failed to apply on top of branch "enterprise-4.19":

Applying: Clarifying IBM Z and IBM Power info in HCP support matrix
Using index info to reconstruct a base tree...
M	modules/hcp-support-matrix.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/hcp-support-matrix.adoc
CONFLICT (content): Merge conflict in modules/hcp-support-matrix.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 Clarifying IBM Z and IBM Power info in HCP support matrix

Details

In response to this:

/cherrypick enterprise-4.19

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.19 branch/enterprise-4.20 branch/enterprise-4.21 branch/enterprise-4.22 branch/enterprise-5.0 lgtm Indicates that a PR is ready to be merged. 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.

4 participants