[WIP]: multiarch: migrate 4.13 s390x and 4.14-from-4.13 upgrade to libvirt-s390x-vpn

ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.13.yaml

@@ -315,64 +315,65 @@ tests:
     workflow: openshift-upgrade-azure
 - as: ocp-e2e-ovn-remote-libvirt-s390x
   capabilities:
-  - sshd-bastion
+  - intranet
   cron: 0 0 1 1 *
   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.13"
       NODE_TUNING: "true"
       STATIC_POD_CHECK_WORKAROUND: "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 4 1 *
   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.13"
       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 6 1 *
   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.13"
       STATIC_POD_CHECK_WORKAROUND: "true"
       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 7 1 *
   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.13"
       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

ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.14-upgrade-from-nightly-4.13.yaml

@@ -138,19 +138,20 @@ tests:
     workflow: openshift-upgrade-aws
 - as: ocp-ovn-remote-libvirt-s390x
   capabilities:
-  - sshd-bastion
+  - intranet
   cron: 0 2 * * 5
   steps:
-    cluster_profile: libvirt-s390x-1
+    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
       BRANCH: "4.13"
       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

ci-operator/jobs/openshift/multiarch/openshift-multiarch-main-periodics.yaml

@@ -6416,7 +6416,7 @@ periodics:
       secret:
         secretName: result-aggregator
 - agent: kubernetes
-  cluster: build01
+  cluster: build12
   cron: 0 0 1 1 *
   decorate: true
   decoration_config:
@@ -6426,9 +6426,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
     ci.openshift.io/generator: prowgen
     job-release: "4.13"
@@ -6917,7 +6917,7 @@ periodics:
       secret:
         secretName: result-aggregator
 - agent: kubernetes
-  cluster: build01
+  cluster: build12
   cron: 0 0 6 1 *
   decorate: true
   decoration_config:
@@ -6927,9 +6927,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
     ci.openshift.io/generator: prowgen
     job-release: "4.13"
@@ -7251,7 +7251,7 @@ periodics:
       secret:
         secretName: result-aggregator
 - agent: kubernetes
-  cluster: build01
+  cluster: build12
   cron: 0 0 7 1 *
   decorate: true
   decoration_config:
@@ -7261,9 +7261,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
     ci.openshift.io/generator: prowgen
     job-release: "4.13"
@@ -7502,7 +7502,7 @@ periodics:
       secret:
         secretName: result-aggregator
 - agent: kubernetes
-  cluster: build01
+  cluster: build12
   cron: 0 0 4 1 *
   decorate: true
   decoration_config:
@@ -7512,9 +7512,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
     ci.openshift.io/generator: prowgen
     job-release: "4.13"
@@ -11417,7 +11417,7 @@ periodics:
       secret:
         secretName: result-aggregator
 - agent: kubernetes
-  cluster: build01
+  cluster: build12
   cron: 0 2 * * 5
   decorate: true
   decoration_config:
@@ -11427,9 +11427,9 @@ periodics:
     org: openshift
     repo: multiarch
   labels:
-    capability/sshd-bastion: sshd-bastion
-    ci-operator.openshift.io/cloud: libvirt-s390x-1
-    ci-operator.openshift.io/cloud-cluster-profile: libvirt-s390x-1
+    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.14-upgrade-from-nightly-4.13
     ci.openshift.io/generator: prowgen
     job-release: "4.14"