Feature s390x multiarch support #12214

viddya673 · 2025-12-09T14:26:16Z

Description

This PR adds multi-architecture support for IBM Z (s390x) to Apache CloudStack. The updates enable key CloudStack components to be built and run on both x86_64 (Intel/AMD) and s390x.

The implementation has been tested using s390x KVM hosts with full cross-architecture interoperability:
x86_64 Management Server <=> s390x Agent

Compatibility and functionality have been validated across the following distributions:
• RHEL
• SLES
• Ubuntu

Types of changes

Breaking change (fix or feature that would cause existing functionality to change)
New feature (non-breaking change which adds functionality)
Bug fix (non-breaking change which fixes an issue)
Enhancement (improves an existing feature and functionality)
Cleanup (Code refactoring and cleanup, that may add test cases)
Build/CI
Test (unit or integration test code)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Major
Minor

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

boring-cyborg · 2025-12-09T14:26:20Z

Congratulations on your first Pull Request and welcome to the Apache CloudStack community! If you have any issues or are unsure about any anything please check our Contribution Guide (https://github.com/apache/cloudstack/blob/main/CONTRIBUTING.md)
Here are some useful points:

In case of a new feature add useful documentation (raise doc PR at https://github.com/apache/cloudstack-documentation)
Be patient and persistent. It might take some time to get a review or get the final approval from the committers.
Pay attention to the quality of your code, ensure tests are passing and your PR doesn't have conflicts.
Please follow ASF Code of Conduct for all communication including (but not limited to) comments on Pull Requests, Issues, Mailing list and Slack.
Be sure to read the CloudStack Coding Conventions.
Apache CloudStack is a community-driven project and together we are making it better 🚀.
In case of doubts contact the developers at:
Mailing List: dev@cloudstack.apache.org (https://cloudstack.apache.org/mailing-lists.html)
Slack: https://apachecloudstack.slack.com/

codecov · 2025-12-09T15:28:04Z

Codecov Report

❌ Patch coverage is 75.00000% with 1 line in your changes missing coverage. Please review.
✅ Project coverage is 17.46%. Comparing base (3c64847) to head (1dcf314).
⚠️ Report is 29 commits behind head on main.

Files with missing lines	Patch %	Lines
...om/cloud/hypervisor/kvm/resource/LibvirtVMDef.java	50.00%	0 Missing and 1 partial ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##              main   #12214       +/-   ##
============================================
+ Coverage     3.58%   17.46%   +13.88%     
- Complexity       0    15528    +15528     
============================================
  Files          445     5913     +5468     
  Lines        37552   529410   +491858     
  Branches      6914    64685    +57771     
============================================
+ Hits          1347    92475    +91128     
- Misses       36039   426513   +390474     
- Partials       166    10422    +10256

Flag	Coverage Δ
uitests	`3.58% <ø> (-0.01%)`	⬇️
unittests	`18.52% <75.00%> (?)`

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

Copilot

Pull request overview

This PR adds multi-architecture support for IBM Z (s390x) to Apache CloudStack, enabling key components to be built and run on both x86_64 and s390x architectures. The implementation enables cross-architecture interoperability between x86_64 management servers and s390x agents.

Key Changes:

Added s390x as a supported CPU architecture alongside existing x86_64 and aarch64 support
Updated UI components to include s390x in architecture selection dropdowns
Modified KVM hypervisor code to handle s390x-specific requirements (ACPI/SMBIOS exclusions)

Reviewed changes

Copilot reviewed 19 out of 19 changed files in this pull request and generated 2 comments.

Show a summary per file

File	Description
`ui/src/views/infra/zone/ZoneWizardAddResources.vue`	Adds s390x architecture option to zone wizard
`ui/src/views/infra/ClusterUpdate.vue`	Adds s390x architecture option to cluster update UI
`ui/src/utils/plugins.js`	Adds s390x to global CPU architecture types utility
`ui/src/components/view/DeployVMFromBackup.vue`	Adds s390x architecture option to VM deployment
`plugins/integrations/kubernetes-service/.../ListKubernetesSupportedVersionsCmd.java`	Updates API documentation to include s390x
`plugins/integrations/kubernetes-service/.../AddKubernetesSupportedVersionCmd.java`	Updates API documentation to include s390x
`plugins/hypervisors/kvm/src/test/java/.../LibvirtComputingResourceTest.java`	Adds conditional test logic for s390x ACPI feature
`plugins/hypervisors/kvm/src/main/java/.../LibvirtVMDef.java`	Excludes SMBIOS mode for s390x architecture
`api/src/test/java/com/cloud/cpu/CPUTest.java`	Adds test coverage for s390x CPU architecture
`api/src/main/java/.../template/RegisterTemplateCmd.java`	Updates API documentation to include s390x
`api/src/main/java/.../template/ListTemplatesCmd.java`	Updates API documentation to include s390x
`api/src/main/java/.../template/GetUploadParamsForTemplateCmd.java`	Updates API documentation to include s390x
`api/src/main/java/.../template/CreateTemplateCmd.java`	Updates API documentation to include s390x
`api/src/main/java/.../iso/RegisterIsoCmd.java`	Updates API documentation to include s390x
`api/src/main/java/.../iso/ListIsosCmd.java`	Updates API documentation to include s390x
`api/src/main/java/.../cluster/UpdateClusterCmd.java`	Updates API documentation to include s390x
`api/src/main/java/.../cluster/AddClusterCmd.java`	Updates API documentation to include s390x
`api/src/main/java/.../BaseUpdateTemplateOrIsoCmd.java`	Updates API documentation to include s390x
`api/src/main/java/com/cloud/cpu/CPU.java`	Adds s390x to CPUArch enum

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

ui/src/views/infra/zone/ZoneWizardAddResources.vue

ui/src/views/infra/ClusterUpdate.vue

shwstppr

code looks good. Some suggestions. Copilot comments on UI consistency make sense

@blueorangutan package

shwstppr · 2025-12-10T08:58:59Z

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java

                    }
                }
-                guestDef.append("<smbios mode='sysinfo'/>\n");
+                if (!(_arch != null && _arch.equals("s390x"))) {


Suggested change

if (!(_arch != null && _arch.equals("s390x"))) {

if (!CPU.CPUArch.s390x.getType().equalsIgnoreCase(_arch)) {

shwstppr · 2025-12-10T08:59:31Z

...visors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java

        assertNodeExists(domainDoc, "/domain/features/pae");
        assertNodeExists(domainDoc, "/domain/features/apic");
-        assertNodeExists(domainDoc, "/domain/features/acpi");
+        if (!"s390x".equals(System.getProperty("os.arch"))) {


Suggested change

if (!"s390x".equals(System.getProperty("os.arch"))) {

if (!CPU.CPUArch.s390x.getType().equalsIgnoreCase(System.getProperty("os.arch"))) {

sureshanaparti · 2025-12-10T12:19:21Z

@blueorangutan package

blueorangutan · 2025-12-10T12:20:04Z

@sureshanaparti a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2025-12-10T13:59:29Z

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 15974

Signed-off-by: Niyam Siwach <niyam@ibm.com> Signed-off-by: Viddya K <viddya.k@ibm.com>

rohityadavcloud · 2025-12-18T05:34:30Z

LGTM, great to see support for a new architecture @viddya673

DaanHoogland · 2025-12-18T10:07:12Z

@blueorangutan test

blueorangutan · 2025-12-18T10:08:04Z

@DaanHoogland a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests

blueorangutan · 2025-12-19T00:04:21Z

[SF] Trillian test result (tid-15025)
Environment: kvm-ol8 (x2), zone: Advanced Networking with Mgmt server ol8
Total time taken: 47541 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr12214-t15025-kvm-ol8.zip
Smoke tests completed. 149 look OK, 1 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
test_01_browser_migrate_template	`Error`	65.64	test_image_store_object_migration.py

weizhouapache

code lgtm

boring-cyborg · 2025-12-19T09:07:01Z

Awesome work, congrats on your first merged pull request!

DaanHoogland · 2025-12-19T09:07:54Z

@viddya673, will you be maintaining a regression suite on a s390 to make sure no regression creeps in from other code?

niyamsw · 2025-12-19T11:26:47Z

Yes — we’re working on adding GitHub Actions CI for s390x, now that it’s supported. This is currently a work in progress.

viddya673 and others added 2 commits December 9, 2025 12:30

Added support for multiarch on s390x

14c8f7d

Merge branch 'apache:main' into feature_s390x_multiarch_support

4e81455

boring-cyborg bot added component:api component:kubernetes component:kvm component:UI labels Dec 9, 2025

Merge branch 'apache:main' into feature_s390x_multiarch_support

f5b613a

DaanHoogland requested a review from Copilot December 9, 2025 15:18

Copilot started reviewing on behalf of DaanHoogland December 9, 2025 15:19 View session

DaanHoogland requested review from kiranchavala and vishesh92 December 9, 2025 15:24

Copilot AI reviewed Dec 9, 2025

View reviewed changes

ui/src/views/infra/zone/ZoneWizardAddResources.vue Outdated Show resolved Hide resolved

ui/src/views/infra/ClusterUpdate.vue Outdated Show resolved Hide resolved

shwstppr approved these changes Dec 10, 2025

View reviewed changes

viddya673 force-pushed the feature_s390x_multiarch_support branch from 279c6a6 to 6fd6f8e Compare December 15, 2025 17:12

Standardize s390x naming in UI and use CPUArch in KVM

1dcf314

Signed-off-by: Niyam Siwach <niyam@ibm.com> Signed-off-by: Viddya K <viddya.k@ibm.com>

viddya673 force-pushed the feature_s390x_multiarch_support branch from 6fd6f8e to 1dcf314 Compare December 16, 2025 05:21

rohityadavcloud approved these changes Dec 18, 2025

View reviewed changes

rohityadavcloud added this to the 4.23 milestone Dec 18, 2025

weizhouapache approved these changes Dec 19, 2025

View reviewed changes

DaanHoogland added has-3rdparty-components 3rd-party:s390 IBM Z 390 series labels Dec 19, 2025

DaanHoogland merged commit 558232e into apache:main Dec 19, 2025
28 checks passed

	if (!(_arch != null && _arch.equals("s390x"))) {
	if (!CPU.CPUArch.s390x.getType().equalsIgnoreCase(_arch)) {

	if (!"s390x".equals(System.getProperty("os.arch"))) {
	if (!CPU.CPUArch.s390x.getType().equalsIgnoreCase(System.getProperty("os.arch"))) {

Feature s390x multiarch support #12214

Feature s390x multiarch support #12214

Uh oh!

Conversation

viddya673 commented Dec 9, 2025

Description

Types of changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

Uh oh!

boring-cyborg bot commented Dec 9, 2025

Uh oh!

codecov bot commented Dec 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Key Changes:

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

shwstppr left a comment

Choose a reason for hiding this comment

Uh oh!

shwstppr Dec 10, 2025

Choose a reason for hiding this comment

Uh oh!

shwstppr Dec 10, 2025

Choose a reason for hiding this comment

Uh oh!

sureshanaparti commented Dec 10, 2025

Uh oh!

blueorangutan commented Dec 10, 2025

Uh oh!

blueorangutan commented Dec 10, 2025

Uh oh!

rohityadavcloud commented Dec 18, 2025

Uh oh!

DaanHoogland commented Dec 18, 2025

Uh oh!

blueorangutan commented Dec 18, 2025

Uh oh!

blueorangutan commented Dec 19, 2025

Uh oh!

weizhouapache left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

boring-cyborg bot commented Dec 19, 2025

Uh oh!

DaanHoogland commented Dec 19, 2025

Uh oh!

niyamsw commented Dec 19, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

codecov bot commented Dec 9, 2025 •

edited

Loading