From bc8892f26de791602098ce969457c86a6c254592 Mon Sep 17 00:00:00 2001 From: Adarsh Kumar Yadav Date: Sat, 8 Aug 2026 13:07:45 +0530 Subject: [PATCH 1/2] multiarch: migrate 4.12 s390x libvirt jobs to libvirt-s390x-vpn Move nightly-4.12 homogeneous s390x jobs and the 4.13-from-4.12 upgrade onto libvirt-s390x-vpn with the existing VPN workflows, preserving BUTANE_RELEASE and pinning migrated periodics to build12. --- ...penshift-multiarch-main__nightly-4.12.yaml | 39 +++++++++--------- ...ightly-4.13-upgrade-from-nightly-4.12.yaml | 9 +++-- .../openshift-multiarch-main-periodics.yaml | 40 +++++++++---------- 3 files changed, 45 insertions(+), 43 deletions(-) diff --git a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.12.yaml b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.12.yaml index 2fc573098028e..e6e071e82aaf6 100644 --- a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.12.yaml +++ b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.12.yaml @@ -301,55 +301,58 @@ tests: workflow: openshift-e2e-azure-ovn - as: ocp-e2e-ovn-remote-libvirt-s390x capabilities: - - sshd-bastion + - intranet cron: 0 0 24 12 * steps: - cluster_profile: libvirt-s390x-2 + cluster_profile: libvirt-s390x-vpn dependencies: - OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:s390x-latest + OPENSHIFT_INSTALL_TARGET: release:s390x-latest env: ARCH: s390x BRANCH: "4.12" BUTANE_RELEASE: 4.12.0 NODE_TUNING: "true" TEST_TYPE: conformance-parallel - workflow: openshift-e2e-libvirt + USE_EXTERNAL_DNS: "true" + workflow: openshift-e2e-libvirt-vpn - as: ocp-image-ecosystem-ovn-remote-libvirt-s390x capabilities: - - sshd-bastion + - intranet cron: 0 0 27 12 * steps: - cluster_profile: libvirt-s390x-2 + cluster_profile: libvirt-s390x-vpn dependencies: - OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:multi-latest + OPENSHIFT_INSTALL_TARGET: release:s390x-latest env: ARCH: s390x BRANCH: "4.12" BUTANE_RELEASE: 4.12.0 TEST_TYPE: image-ecosystem - workflow: openshift-e2e-libvirt + USE_EXTERNAL_DNS: "true" + workflow: openshift-e2e-libvirt-vpn - as: ocp-e2e-serial-ovn-remote-libvirt-s390x capabilities: - - sshd-bastion + - intranet cron: 0 0 29 12 * steps: - cluster_profile: libvirt-s390x-2 + cluster_profile: libvirt-s390x-vpn dependencies: - OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:s390x-latest + OPENSHIFT_INSTALL_TARGET: release:s390x-latest env: ARCH: s390x BRANCH: "4.12" BUTANE_RELEASE: 4.12.0 TEST_TYPE: conformance-serial - workflow: openshift-e2e-libvirt + USE_EXTERNAL_DNS: "true" + workflow: openshift-e2e-libvirt-vpn - as: ocp-fips-ovn-remote-libvirt-s390x capabilities: - - sshd-bastion + - intranet cron: 0 0 30 12 * steps: - cluster_profile: libvirt-s390x-2 + cluster_profile: libvirt-s390x-vpn dependencies: - OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:s390x-latest + OPENSHIFT_INSTALL_TARGET: release:s390x-latest env: ARCH: s390x BRANCH: "4.12" @@ -357,10 +360,8 @@ tests: FIPS_ENABLED: "true" NODE_TUNING: "true" TEST_TYPE: conformance-parallel - pre: - - chain: ipi-libvirt-pre - - ref: fips-check - workflow: openshift-e2e-libvirt + USE_EXTERNAL_DNS: "true" + workflow: openshift-e2e-libvirt-vpn-fips - as: ocp-e2e-ovn-remote-s2s-libvirt-ppc64le capabilities: - power-s2s-dns diff --git a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.13-upgrade-from-nightly-4.12.yaml b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.13-upgrade-from-nightly-4.12.yaml index 7fe0027ffef38..2c55f2d45caf5 100644 --- a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.13-upgrade-from-nightly-4.12.yaml +++ b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.13-upgrade-from-nightly-4.12.yaml @@ -138,12 +138,12 @@ tests: workflow: openshift-upgrade-aws - as: ocp-ovn-remote-libvirt-s390x capabilities: - - sshd-bastion + - intranet cron: 0 0 3 1 * steps: - cluster_profile: libvirt-s390x-2 + cluster_profile: libvirt-s390x-vpn dependencies: - OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:s390x-initial + OPENSHIFT_INSTALL_TARGET: release:s390x-initial OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:s390x-latest env: ARCH: s390x @@ -151,7 +151,8 @@ tests: BUTANE_RELEASE: 4.12.0 NODE_TUNING: "true" TEST_TYPE: upgrade - workflow: openshift-e2e-libvirt + USE_EXTERNAL_DNS: "true" + workflow: openshift-e2e-libvirt-vpn - as: ocp-ovn-remote-s2s-libvirt-ppc64le capabilities: - power-s2s-dns diff --git a/ci-operator/jobs/openshift/multiarch/openshift-multiarch-main-periodics.yaml b/ci-operator/jobs/openshift/multiarch/openshift-multiarch-main-periodics.yaml index 23f64c05482e6..5c0ddaa3dd3b5 100644 --- a/ci-operator/jobs/openshift/multiarch/openshift-multiarch-main-periodics.yaml +++ b/ci-operator/jobs/openshift/multiarch/openshift-multiarch-main-periodics.yaml @@ -4249,7 +4249,7 @@ periodics: secret: secretName: result-aggregator - agent: kubernetes - cluster: build01 + cluster: build12 cron: 0 0 24 12 * decorate: true decoration_config: @@ -4259,9 +4259,9 @@ periodics: org: openshift repo: multiarch labels: - capability/sshd-bastion: sshd-bastion - ci-operator.openshift.io/cloud: libvirt-s390x-2 - ci-operator.openshift.io/cloud-cluster-profile: libvirt-s390x-2 + capability/intranet: intranet + ci-operator.openshift.io/cloud: libvirt-s390x-vpn + ci-operator.openshift.io/cloud-cluster-profile: libvirt-s390x-vpn ci-operator.openshift.io/variant: nightly-4.12 ci.openshift.io/generator: prowgen job-release: "4.12" @@ -4666,7 +4666,7 @@ periodics: secret: secretName: result-aggregator - agent: kubernetes - cluster: build01 + cluster: build12 cron: 0 0 29 12 * decorate: true decoration_config: @@ -4676,9 +4676,9 @@ periodics: org: openshift repo: multiarch labels: - capability/sshd-bastion: sshd-bastion - ci-operator.openshift.io/cloud: libvirt-s390x-2 - ci-operator.openshift.io/cloud-cluster-profile: libvirt-s390x-2 + capability/intranet: intranet + ci-operator.openshift.io/cloud: libvirt-s390x-vpn + ci-operator.openshift.io/cloud-cluster-profile: libvirt-s390x-vpn ci-operator.openshift.io/variant: nightly-4.12 ci.openshift.io/generator: prowgen job-release: "4.12" @@ -4917,7 +4917,7 @@ periodics: secret: secretName: result-aggregator - agent: kubernetes - cluster: build01 + cluster: build12 cron: 0 0 30 12 * decorate: true decoration_config: @@ -4927,9 +4927,9 @@ periodics: org: openshift repo: multiarch labels: - capability/sshd-bastion: sshd-bastion - ci-operator.openshift.io/cloud: libvirt-s390x-2 - ci-operator.openshift.io/cloud-cluster-profile: libvirt-s390x-2 + capability/intranet: intranet + ci-operator.openshift.io/cloud: libvirt-s390x-vpn + ci-operator.openshift.io/cloud-cluster-profile: libvirt-s390x-vpn ci-operator.openshift.io/variant: nightly-4.12 ci.openshift.io/generator: prowgen job-release: "4.12" @@ -5168,7 +5168,7 @@ periodics: secret: secretName: result-aggregator - agent: kubernetes - cluster: build01 + cluster: build12 cron: 0 0 27 12 * decorate: true decoration_config: @@ -5178,9 +5178,9 @@ periodics: org: openshift repo: multiarch labels: - capability/sshd-bastion: sshd-bastion - ci-operator.openshift.io/cloud: libvirt-s390x-2 - ci-operator.openshift.io/cloud-cluster-profile: libvirt-s390x-2 + capability/intranet: intranet + ci-operator.openshift.io/cloud: libvirt-s390x-vpn + ci-operator.openshift.io/cloud-cluster-profile: libvirt-s390x-vpn ci-operator.openshift.io/variant: nightly-4.12 ci.openshift.io/generator: prowgen job-release: "4.12" @@ -8002,7 +8002,7 @@ periodics: secret: secretName: result-aggregator - agent: kubernetes - cluster: build01 + cluster: build12 cron: 0 0 3 1 * decorate: true decoration_config: @@ -8012,9 +8012,9 @@ periodics: org: openshift repo: multiarch labels: - capability/sshd-bastion: sshd-bastion - ci-operator.openshift.io/cloud: libvirt-s390x-2 - ci-operator.openshift.io/cloud-cluster-profile: libvirt-s390x-2 + capability/intranet: intranet + ci-operator.openshift.io/cloud: libvirt-s390x-vpn + ci-operator.openshift.io/cloud-cluster-profile: libvirt-s390x-vpn ci-operator.openshift.io/variant: nightly-4.13-upgrade-from-nightly-4.12 ci.openshift.io/generator: prowgen job-release: "4.13" From d79b6962132fd877b3cb58bf409bcad86e5ee6cb Mon Sep 17 00:00:00 2001 From: Adarsh Kumar Yadav Date: Sat, 8 Aug 2026 13:08:59 +0530 Subject: [PATCH 2/2] multiarch: quote BUTANE_RELEASE 4.12.0 on VPN-migrated s390x jobs upi-conf-libvirt always runs kdump configure via Butane; the step defaults to 4.15.0 (Ignition 3.4) which 4.12 MCC cannot parse. Keep an explicitly quoted version-matched BUTANE_RELEASE so bootstrap does not time out on MCC crash-loops. --- .../multiarch/openshift-multiarch-main__nightly-4.12.yaml | 8 ++++---- ...arch-main__nightly-4.13-upgrade-from-nightly-4.12.yaml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.12.yaml b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.12.yaml index e6e071e82aaf6..23beb30e7ce6c 100644 --- a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.12.yaml +++ b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.12.yaml @@ -310,7 +310,7 @@ tests: env: ARCH: s390x BRANCH: "4.12" - BUTANE_RELEASE: 4.12.0 + BUTANE_RELEASE: "4.12.0" NODE_TUNING: "true" TEST_TYPE: conformance-parallel USE_EXTERNAL_DNS: "true" @@ -326,7 +326,7 @@ tests: env: ARCH: s390x BRANCH: "4.12" - BUTANE_RELEASE: 4.12.0 + BUTANE_RELEASE: "4.12.0" TEST_TYPE: image-ecosystem USE_EXTERNAL_DNS: "true" workflow: openshift-e2e-libvirt-vpn @@ -341,7 +341,7 @@ tests: env: ARCH: s390x BRANCH: "4.12" - BUTANE_RELEASE: 4.12.0 + BUTANE_RELEASE: "4.12.0" TEST_TYPE: conformance-serial USE_EXTERNAL_DNS: "true" workflow: openshift-e2e-libvirt-vpn @@ -356,7 +356,7 @@ tests: env: ARCH: s390x BRANCH: "4.12" - BUTANE_RELEASE: 4.12.0 + BUTANE_RELEASE: "4.12.0" FIPS_ENABLED: "true" NODE_TUNING: "true" TEST_TYPE: conformance-parallel diff --git a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.13-upgrade-from-nightly-4.12.yaml b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.13-upgrade-from-nightly-4.12.yaml index 2c55f2d45caf5..99caba1ae632c 100644 --- a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.13-upgrade-from-nightly-4.12.yaml +++ b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.13-upgrade-from-nightly-4.12.yaml @@ -148,7 +148,7 @@ tests: env: ARCH: s390x BRANCH: "4.12" - BUTANE_RELEASE: 4.12.0 + BUTANE_RELEASE: "4.12.0" NODE_TUNING: "true" TEST_TYPE: upgrade USE_EXTERNAL_DNS: "true"