diff --git a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.21-upgrade-from-nightly-4.20.yaml b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.21-upgrade-from-nightly-4.20.yaml index a08ad13fc9d8e..3532a10eaaf7a 100644 --- a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.21-upgrade-from-nightly-4.20.yaml +++ b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.21-upgrade-from-nightly-4.20.yaml @@ -101,8 +101,7 @@ tests: cluster_profile: openshift-org-gcp env: ADDITIONAL_WORKER_ARCHITECTURE: aarch64 - ADDITIONAL_WORKER_VM_TYPE: t2a-standard-2 - COMPUTE_NODE_REPLICAS: "2" + ADDITIONAL_WORKER_VM_TYPE: t2a-standard-4 OCP_ARCH: amd64 TEST_SUITE: upgrade-conformance workflow: openshift-upgrade-gcp-heterogeneous @@ -133,8 +132,6 @@ tests: USE_EXTERNAL_DNS: "true" workflow: openshift-e2e-libvirt-vpn - as: ocp-ovn-remote-s2s-libvirt-multi-p-p - capabilities: - - power-s2s-dns cron: 0 5 * * 1-4 steps: cluster_profile: libvirt-ppc64le-s2s @@ -145,9 +142,10 @@ tests: BRANCH: "4.19" ETCD_DISK_SPEED: slow TEST_TYPE: upgrade + USE_EXTERNAL_DNS: "true" workflow: openshift-e2e-libvirt-upi zz_generated_metadata: branch: main org: openshift repo: multiarch - variant: nightly-4.21-upgrade-from-nightly-4.20 + variant: nightly-4.21-upgrade-from-nightly-4.20 \ No newline at end of file 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 3123ab4a507c8..c0e3dab86feec 100644 --- a/ci-operator/jobs/openshift/multiarch/openshift-multiarch-main-periodics.yaml +++ b/ci-operator/jobs/openshift/multiarch/openshift-multiarch-main-periodics.yaml @@ -45924,7 +45924,6 @@ periodics: org: openshift repo: multiarch labels: - capability/power-s2s-dns: power-s2s-dns ci-operator.openshift.io/cloud: libvirt-ppc64le-s2s ci-operator.openshift.io/cloud-cluster-profile: libvirt-ppc64le-s2s ci-operator.openshift.io/variant: nightly-4.21-upgrade-from-nightly-4.20