Skip to content

multiarch: migrate 4.16 homogeneous s390x jobs to libvirt VPN#78967

Merged
openshift-merge-bot[bot] merged 2 commits intoopenshift:mainfrom
ibm-adarsh:4.16-z-migration
May 8, 2026
Merged

multiarch: migrate 4.16 homogeneous s390x jobs to libvirt VPN#78967
openshift-merge-bot[bot] merged 2 commits intoopenshift:mainfrom
ibm-adarsh:4.16-z-migration

Conversation

@ibm-adarsh
Copy link
Copy Markdown
Contributor

@ibm-adarsh ibm-adarsh commented May 7, 2026

  • Switch cluster_profile from libvirt-s390x-1 to libvirt-s390x-vpn
  • Replace sshd-bastion with intranet capability
  • Use openshift-e2e-libvirt-vpn (vpn-fips for FIPS)
  • Add ETCD_DISK_SPEED slow, USE_EXTERNAL_DNS, s390x-latest for image/jenkins
  • Regenerate nightly-4.16 periodics (labels, cluster scheduling)

Summary

This pull request migrates OpenShift's multiarch CI infrastructure for s390x (IBM System z) test jobs from the existing libvirt-s390x-1 cluster to a new VPN-based setup (libvirt-s390x-vpn).

What Changed

The configuration in ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.16.yaml was updated to reconfigure 4.16 nightly periodics and homogeneous s390x test jobs with:

  • Cluster Profile: Changed from libvirt-s390x-1 to libvirt-s390x-vpn for infrastructure access
  • Network Access: Replaced sshd-bastion capability with intranet capability for how jobs connect to the lab environment
  • Environment Variables: Added ETCD_DISK_SPEED: slow and USE_EXTERNAL_DNS: true to configure test environment parameters

Affected Jobs

The changes apply to multiple s390x libvirt-based CI jobs including:

  • ocp-e2e-ovn-remote-libvirt-s390x
  • ocp-heavy-build-ovn-remote-libvirt-s390x
  • ocp-image-ecosystem-ovn-remote-libvirt-s390x
  • ocp-jenkins-e2e-ovn-remote-libvirt-s390x
  • ocp-e2e-serial-ovn-remote-libvirt-s390x
  • ocp-fips-ovn-remote-libvirt-s390x (with FIPS variant)

Impact

This migration moves s390x test infrastructure to a new VPN-based architecture, likely to improve reliability and security of remote lab access for testing on IBM System z hardware.

- Switch cluster_profile from libvirt-s390x-1 to libvirt-s390x-vpn
- Replace sshd-bastion with intranet capability
- Use openshift-e2e-libvirt-vpn (vpn-fips for FIPS)
- Add ETCD_DISK_SPEED slow, USE_EXTERNAL_DNS, s390x-latest for image/jenkins
- Regenerate nightly-4.16 periodics (labels, cluster scheduling)
@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 May 7, 2026
@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented May 7, 2026

Important

Review skipped

Review was skipped due to path filters

⛔ Files ignored due to path filters (1)
  • ci-operator/jobs/openshift/multiarch/openshift-multiarch-main-periodics.yaml is excluded by !ci-operator/jobs/**

CodeRabbit blocks several paths by default. You can override this behavior by explicitly including those paths in the path filters. For example, including **/dist/** will override the default block on the dist directory, by removing the pattern from both the lists.

⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: a698a630-cd97-45cc-b1a3-02693a97f1ef

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review

Walkthrough

CI job configurations for OpenShift s390x libvirt-based jobs are updated to migrate from sshd-bastion capability and libvirt-s390x-1 cluster profile to intranet capability and libvirt-s390x-vpn cluster profile. Environment variables ETCD_DISK_SPEED: slow and USE_EXTERNAL_DNS: "true" are added across all six affected job definitions.

Changes

s390x Libvirt Job Configuration Migration

Layer / File(s) Summary
Cluster & Network Configuration
ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.16.yaml
Six libvirt s390x jobs (ocp-e2e-ovn-remote-libvirt-s390x, ocp-heavy-build-ovn-remote-libvirt-s390x, ocp-image-ecosystem-ovn-remote-libvirt-s390x, ocp-jenkins-e2e-ovn-remote-libvirt-s390x, ocp-e2e-serial-ovn-remote-libvirt-s390x, ocp-fips-ovn-remote-libvirt-s390x) are updated to use intranet capability instead of sshd-bastion and libvirt-s390x-vpn cluster profile instead of libvirt-s390x-1.
Environment Variables
ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.16.yaml
ETCD_DISK_SPEED: slow and USE_EXTERNAL_DNS: "true" are added to all six jobs; existing variables (BRANCH: "4.16", NODE_TUNING: "true", FIPS_ENABLED: "true") are preserved.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~12 minutes

🚥 Pre-merge checks | ✅ 12
✅ Passed checks (12 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title accurately summarizes the main change: migrating s390x CI jobs from one libvirt configuration (sshd-bastion/libvirt-s390x-1) to another (intranet/libvirt-s390x-vpn), which is the primary focus of the changeset.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names ✅ Passed PR modifies only CI/CD configuration YAML files. No Ginkgo test code is present. The check for "Stable and Deterministic Test Names" is not applicable.
Test Structure And Quality ✅ Passed The PR only modifies CI configuration YAML files and contains no Ginkgo test code. The custom check for test structure quality is not applicable to this PR.
Microshift Test Compatibility ✅ Passed PR contains only YAML CI configuration changes with no new Ginkgo e2e test code. Custom check requires new test code additions to apply.
Single Node Openshift (Sno) Test Compatibility ✅ Passed PR contains only CI job configuration YAML changes, no new Ginkgo e2e test code. SNO compatibility check is not applicable.
Topology-Aware Scheduling Compatibility ✅ Passed PR modifies CI-Operator config (test job definitions), not Kubernetes manifests or operator code. No topology-aware scheduling constraints introduced. Check is not applicable.
Ote Binary Stdout Contract ✅ Passed Check not applicable. PR contains CI infrastructure config changes and tooling files, not OTE test binary code that communicates with openshift-tests via JSON stdout.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed PR modifies only YAML CI configuration, not test code. No new Ginkgo e2e tests added, so the IPv6/disconnected network compatibility check does not apply.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@openshift-ci openshift-ci Bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label May 7, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 7, 2026

Hi @ibm-adarsh. Thanks for your PR.

I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work.

Tip

We noticed you've done this a few times! Consider joining the org to skip this step and gain /lgtm and other bot rights. We recommend asking approvers on your previous PRs to sponsor you.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@v78singh
Copy link
Copy Markdown

v78singh commented May 7, 2026

/ok-to-test

@openshift-ci openshift-ci Bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels May 7, 2026
@ibm-adarsh
Copy link
Copy Markdown
Contributor Author

/test ordered-prow-config

1 similar comment
@ibm-adarsh
Copy link
Copy Markdown
Contributor Author

/test ordered-prow-config

Add missing cluster assignment for six 4.16 libvirt s390x periodic jobs to match generated Prow job formatting and fix check-prow-job-config.
@ibm-adarsh
Copy link
Copy Markdown
Contributor Author

/test ordered-prow-config

@ibm-adarsh ibm-adarsh marked this pull request as ready for review May 7, 2026 10:49
@openshift-ci openshift-ci Bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 7, 2026
@openshift-ci openshift-ci Bot requested review from prb112 and sosiouxme May 7, 2026 10:49
@ibm-adarsh
Copy link
Copy Markdown
Contributor Author

/pj-rehearse periodic-ci-openshift-multiarch-main-nightly-4.16-ocp-e2e-ovn-remote-libvirt-s390x
/pj-rehearse periodic-ci-openshift-multiarch-main-nightly-4.16-ocp-heavy-build-ovn-remote-libvirt-s390x
/pj-rehearse periodic-ci-openshift-multiarch-main-nightly-4.16-ocp-image-ecosystem-ovn-remote-libvirt-s390x
/pj-rehearse periodic-ci-openshift-multiarch-main-nightly-4.16-ocp-jenkins-e2e-ovn-remote-libvirt-s390x
/pj-rehearse periodic-ci-openshift-multiarch-main-nightly-4.16-ocp-e2e-serial-ovn-remote-libvirt-s390x
/pj-rehearse periodic-ci-openshift-multiarch-main-nightly-4.16-ocp-fips-ovn-remote-libvirt-s390x

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@ibm-adarsh: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@ibm-adarsh
Copy link
Copy Markdown
Contributor Author

/pj-rehearse periodic-ci-openshift-multiarch-main-nightly-4.16-ocp-e2e-ovn-remote-libvirt-s390x
/pj-rehearse periodic-ci-openshift-multiarch-main-nightly-4.16-ocp-heavy-build-ovn-remote-libvirt-s390x
/pj-rehearse periodic-ci-openshift-multiarch-main-nightly-4.16-ocp-image-ecosystem-ovn-remote-libvirt-s390x
/pj-rehearse periodic-ci-openshift-multiarch-main-nightly-4.16-ocp-jenkins-e2e-ovn-remote-libvirt-s390x
/pj-rehearse periodic-ci-openshift-multiarch-main-nightly-4.16-ocp-e2e-serial-ovn-remote-libvirt-s390x
/pj-rehearse periodic-ci-openshift-multiarch-main-nightly-4.16-ocp-fips-ovn-remote-libvirt-s390x

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@ibm-adarsh: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@adarshkumaryadav
Copy link
Copy Markdown

/pj-rehearse periodic-ci-openshift-multiarch-main-nightly-4.16-ocp-e2e-ovn-remote-libvirt-s390x

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@adarshkumaryadav: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@adarshkumaryadav
Copy link
Copy Markdown

/pj-rehearse periodic-ci-openshift-multiarch-main-nightly-4.16-ocp-e2e-ovn-remote-libvirt-s390x

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@adarshkumaryadav: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@yogirajk
Copy link
Copy Markdown

yogirajk commented May 7, 2026

/pj-rehearse periodic-ci-openshift-multiarch-main-nightly-4.16-ocp-e2e-ovn-remote-libvirt-s390x

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@yogirajk: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@adarshkumaryadav
Copy link
Copy Markdown

/pj-rehearse periodic-ci-openshift-multiarch-main-nightly-4.16-ocp-e2e-ovn-remote-libvirt-s390x

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@adarshkumaryadav: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@adarshkumaryadav
Copy link
Copy Markdown

/pj-rehearse periodic-ci-openshift-multiarch-main-nightly-4.16-ocp-heavy-build-ovn-remote-libvirt-s390x
/pj-rehearse periodic-ci-openshift-multiarch-main-nightly-4.16-ocp-image-ecosystem-ovn-remote-libvirt-s390x
/pj-rehearse periodic-ci-openshift-multiarch-main-nightly-4.16-ocp-jenkins-e2e-ovn-remote-libvirt-s390x
/pj-rehearse periodic-ci-openshift-multiarch-main-nightly-4.16-ocp-e2e-serial-ovn-remote-libvirt-s390x
/pj-rehearse periodic-ci-openshift-multiarch-main-nightly-4.16-ocp-fips-ovn-remote-libvirt-s390x

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@adarshkumaryadav: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@adarshkumaryadav: requesting more than one rehearsal in one comment is not supported. If you would like to rehearse multiple specific jobs, please separate the job names by a space in a single command.

3 similar comments
@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@adarshkumaryadav: requesting more than one rehearsal in one comment is not supported. If you would like to rehearse multiple specific jobs, please separate the job names by a space in a single command.

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@adarshkumaryadav: requesting more than one rehearsal in one comment is not supported. If you would like to rehearse multiple specific jobs, please separate the job names by a space in a single command.

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@adarshkumaryadav: requesting more than one rehearsal in one comment is not supported. If you would like to rehearse multiple specific jobs, please separate the job names by a space in a single command.

@ibm-adarsh
Copy link
Copy Markdown
Contributor Author

/pj-rehearse periodic-ci-openshift-multiarch-main-nightly-4.16-ocp-image-ecosystem-ovn-remote-libvirt-s390x

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@ibm-adarsh: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@ibm-adarsh
Copy link
Copy Markdown
Contributor Author

/pj-rehearse periodic-ci-openshift-multiarch-main-nightly-4.16-ocp-jenkins-e2e-ovn-remote-libvirt-s390x

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@ibm-adarsh: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@ibm-adarsh
Copy link
Copy Markdown
Contributor Author

/pj-rehearse periodic-ci-openshift-multiarch-main-nightly-4.16-ocp-e2e-serial-ovn-remote-libvirt-s390x

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@ibm-adarsh: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@ibm-adarsh
Copy link
Copy Markdown
Contributor Author

/pj-rehearse periodic-ci-openshift-multiarch-main-nightly-4.16-ocp-fips-ovn-remote-libvirt-s390x

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@ibm-adarsh: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@sandisamp
Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label May 8, 2026
@sandisamp
Copy link
Copy Markdown
Contributor

/approve

@ibm-adarsh
Copy link
Copy Markdown
Contributor Author

/pj-rehearse ack

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@ibm-adarsh: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@openshift-merge-bot openshift-merge-bot Bot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label May 8, 2026
@v78singh
Copy link
Copy Markdown

v78singh commented May 8, 2026

/approve

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 8, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ibm-adarsh, sandisamp, v78singh

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 8, 2026
@ibm-adarsh
Copy link
Copy Markdown
Contributor Author

/test owners

@ibm-adarsh
Copy link
Copy Markdown
Contributor Author

/test prow-config-filenames

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 8, 2026

@ibm-adarsh: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/rehearse/periodic-ci-openshift-multiarch-main-nightly-4.16-ocp-image-ecosystem-ovn-remote-libvirt-s390x e98d292 link unknown /pj-rehearse periodic-ci-openshift-multiarch-main-nightly-4.16-ocp-image-ecosystem-ovn-remote-libvirt-s390x
ci/rehearse/periodic-ci-openshift-multiarch-main-nightly-4.16-ocp-e2e-serial-ovn-remote-libvirt-s390x e98d292 link unknown /pj-rehearse periodic-ci-openshift-multiarch-main-nightly-4.16-ocp-e2e-serial-ovn-remote-libvirt-s390x
ci/rehearse/periodic-ci-openshift-multiarch-main-nightly-4.16-ocp-e2e-ovn-remote-libvirt-s390x e98d292 link unknown /pj-rehearse periodic-ci-openshift-multiarch-main-nightly-4.16-ocp-e2e-ovn-remote-libvirt-s390x
ci/rehearse/periodic-ci-openshift-multiarch-main-nightly-4.16-ocp-heavy-build-ovn-remote-libvirt-s390x e98d292 link unknown /pj-rehearse periodic-ci-openshift-multiarch-main-nightly-4.16-ocp-heavy-build-ovn-remote-libvirt-s390x

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.

@openshift-merge-bot openshift-merge-bot Bot merged commit f0d000e into openshift:main May 8, 2026
18 of 22 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. rehearsals-ack Signifies that rehearsal jobs have been acknowledged

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants