diff --git a/ci-operator/config/openshift/multiarch/openshift-multiarch-master__nightly-4.11.yaml b/ci-operator/config/openshift/multiarch/openshift-multiarch-master__nightly-4.11.yaml index b22449a951f87..8cfdbb257ae30 100644 --- a/ci-operator/config/openshift/multiarch/openshift-multiarch-master__nightly-4.11.yaml +++ b/ci-operator/config/openshift/multiarch/openshift-multiarch-master__nightly-4.11.yaml @@ -156,7 +156,6 @@ tests: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest env: BASE_DOMAIN: arm-ci.devcluster.openshift.com - COMPUTE_NODE_TYPE: m6g.xlarge workflow: openshift-e2e-aws - as: ocp-e2e-metal-ipi-ovn-arm64 cluster: build05 @@ -180,7 +179,6 @@ tests: OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:arm64-latest env: BASE_DOMAIN: arm-ci.devcluster.openshift.com - COMPUTE_NODE_TYPE: m6g.xlarge TEST_SUITE: upgrade-conformance workflow: openshift-upgrade-aws - as: ocp-installer-e2e-aws-ovn-arm64 @@ -191,7 +189,6 @@ tests: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest env: BASE_DOMAIN: arm-ci.devcluster.openshift.com - COMPUTE_NODE_TYPE: m6g.xlarge workflow: ipi-aws-ovn - as: ocp-image-ecosystem-aws-arm64 interval: 72h @@ -201,7 +198,6 @@ tests: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest env: BASE_DOMAIN: arm-ci.devcluster.openshift.com - COMPUTE_NODE_TYPE: m6g.xlarge workflow: openshift-e2e-aws-image-ecosystem - as: ocp-jenkins-e2e-aws-arm64 interval: 72h @@ -211,7 +207,6 @@ tests: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest env: BASE_DOMAIN: arm-ci.devcluster.openshift.com - COMPUTE_NODE_TYPE: m6g.xlarge TEST_SUITE: openshift/jenkins-e2e-rhel-only workflow: openshift-e2e-aws - as: ocp-e2e-serial-aws-arm64 @@ -222,7 +217,6 @@ tests: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest env: BASE_DOMAIN: arm-ci.devcluster.openshift.com - COMPUTE_NODE_TYPE: m6g.xlarge workflow: openshift-e2e-aws-serial - as: ocp-e2e-ovn-serial-aws-arm64 interval: 72h @@ -232,7 +226,6 @@ tests: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest env: BASE_DOMAIN: arm-ci.devcluster.openshift.com - COMPUTE_NODE_TYPE: m6g.xlarge workflow: openshift-e2e-aws-ovn-serial - as: ocp-e2e-aws-ovn-arm64 cron: 12 17 */1 * 1-5 @@ -242,7 +235,6 @@ tests: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest env: BASE_DOMAIN: arm-ci.devcluster.openshift.com - COMPUTE_NODE_TYPE: m6g.xlarge workflow: openshift-e2e-aws-ovn - as: ocp-e2e-aws-upi-arm64 cron: 42 0 */1 * 1-5 @@ -274,7 +266,6 @@ tests: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest env: BASE_DOMAIN: arm-ci.devcluster.openshift.com - COMPUTE_NODE_TYPE: m6g.xlarge workflow: openshift-e2e-aws-techpreview - as: ocp-e2e-aws-arm64-techpreview-serial interval: 72h @@ -284,7 +275,6 @@ tests: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest env: BASE_DOMAIN: arm-ci.devcluster.openshift.com - COMPUTE_NODE_TYPE: m6g.xlarge workflow: openshift-e2e-aws-techpreview-serial - as: ocp-e2e-remote-libvirt-s390x cluster: build01 diff --git a/ci-operator/config/openshift/multiarch/openshift-multiarch-master__nightly-4.12.yaml b/ci-operator/config/openshift/multiarch/openshift-multiarch-master__nightly-4.12.yaml index 71e4f45e3a0a0..908e8afd9dfb1 100644 --- a/ci-operator/config/openshift/multiarch/openshift-multiarch-master__nightly-4.12.yaml +++ b/ci-operator/config/openshift/multiarch/openshift-multiarch-master__nightly-4.12.yaml @@ -156,7 +156,6 @@ tests: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest env: BASE_DOMAIN: arm-ci.devcluster.openshift.com - COMPUTE_NODE_TYPE: m6g.xlarge workflow: openshift-e2e-aws-sdn - as: ocp-e2e-upgrade-aws-ovn-arm64 interval: 72h @@ -167,7 +166,6 @@ tests: OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:arm64-latest env: BASE_DOMAIN: arm-ci.devcluster.openshift.com - COMPUTE_NODE_TYPE: m6g.xlarge TEST_SUITE: upgrade-conformance workflow: openshift-upgrade-aws - as: ocp-installer-e2e-aws-ovn-arm64 @@ -178,7 +176,6 @@ tests: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest env: BASE_DOMAIN: arm-ci.devcluster.openshift.com - COMPUTE_NODE_TYPE: m6g.xlarge workflow: ipi-aws-ovn - as: ocp-image-ecosystem-aws-ovn-arm64 interval: 96h @@ -188,7 +185,6 @@ tests: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest env: BASE_DOMAIN: arm-ci.devcluster.openshift.com - COMPUTE_NODE_TYPE: m6g.xlarge workflow: openshift-e2e-aws-image-ecosystem - as: ocp-jenkins-e2e-aws-ovn-arm64 interval: 96h @@ -198,7 +194,6 @@ tests: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest env: BASE_DOMAIN: arm-ci.devcluster.openshift.com - COMPUTE_NODE_TYPE: m6g.xlarge TEST_SUITE: openshift/jenkins-e2e-rhel-only workflow: openshift-e2e-aws - as: ocp-e2e-sdn-serial-aws-arm64 @@ -209,7 +204,6 @@ tests: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest env: BASE_DOMAIN: arm-ci.devcluster.openshift.com - COMPUTE_NODE_TYPE: m6g.xlarge workflow: openshift-e2e-aws-sdn-serial - as: ocp-e2e-ovn-serial-aws-arm64 interval: 72h @@ -219,7 +213,6 @@ tests: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest env: BASE_DOMAIN: arm-ci.devcluster.openshift.com - COMPUTE_NODE_TYPE: m6g.xlarge workflow: openshift-e2e-aws-ovn-serial - as: ocp-e2e-aws-ovn-arm64 interval: 72h @@ -229,7 +222,6 @@ tests: OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest env: BASE_DOMAIN: arm-ci.devcluster.openshift.com - COMPUTE_NODE_TYPE: m6g.xlarge workflow: openshift-e2e-aws-ovn - as: ocp-e2e-aws-upi-ovn-arm64 interval: 72h