diff --git a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-main.yaml b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-main.yaml index d3b6de80b728f..304ad77b548c0 100644 --- a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-main.yaml +++ b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-main.yaml @@ -1119,6 +1119,8 @@ tests: steps: cluster_profile: openshift-org-aws env: + COMPUTE_NODE_TYPE: m6a.2xlarge + CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge FIPS_ENABLED: "true" TEST_SUITE: openshift/conformance/parallel pre: diff --git a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.22.yaml b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.22.yaml index ff2b8a9bb1c5a..279c1f7b131cf 100644 --- a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.22.yaml +++ b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.22.yaml @@ -1115,6 +1115,8 @@ tests: steps: cluster_profile: openshift-org-aws env: + COMPUTE_NODE_TYPE: m6a.2xlarge + CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge FIPS_ENABLED: "true" TEST_SUITE: openshift/conformance/parallel pre: diff --git a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.23.yaml b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.23.yaml index e4c6ea66dab87..957fc35f419a1 100644 --- a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.23.yaml +++ b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.23.yaml @@ -1119,6 +1119,8 @@ tests: steps: cluster_profile: openshift-org-aws env: + COMPUTE_NODE_TYPE: m6a.2xlarge + CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge FIPS_ENABLED: "true" TEST_SUITE: openshift/conformance/parallel pre: diff --git a/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-master.yaml b/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-master.yaml index 238ce63cdcee7..d2f28e6d17244 100644 --- a/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-master.yaml +++ b/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-master.yaml @@ -449,6 +449,8 @@ tests: steps: cluster_profile: openshift-org-aws env: + COMPUTE_NODE_TYPE: m6a.2xlarge + CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge FIPS_ENABLED: "true" TEST_SUITE: openshift/conformance/parallel pre: diff --git a/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.22.yaml b/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.22.yaml index 8812451c25327..b625a6979c384 100644 --- a/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.22.yaml +++ b/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.22.yaml @@ -417,6 +417,8 @@ tests: steps: cluster_profile: openshift-org-aws env: + COMPUTE_NODE_TYPE: m6a.2xlarge + CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge FIPS_ENABLED: "true" TEST_SUITE: openshift/conformance/parallel pre: diff --git a/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.23.yaml b/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.23.yaml index 77d6943dbad12..6b42ab74773e6 100644 --- a/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.23.yaml +++ b/ci-operator/config/openshift-priv/kubernetes/openshift-priv-kubernetes-release-4.23.yaml @@ -436,6 +436,8 @@ tests: steps: cluster_profile: openshift-org-aws env: + COMPUTE_NODE_TYPE: m6a.2xlarge + CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge FIPS_ENABLED: "true" TEST_SUITE: openshift/conformance/parallel pre: diff --git a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-main.yaml b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-main.yaml index 8a9fef08ba682..48839a260f3cf 100644 --- a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-main.yaml +++ b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-main.yaml @@ -162,6 +162,8 @@ tests: steps: cluster_profile: openshift-org-aws env: + COMPUTE_NODE_TYPE: m6a.2xlarge + CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge FIPS_ENABLED: "true" pre: - chain: ipi-aws-pre diff --git a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.22.yaml b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.22.yaml index 42ef25014ad1f..c1f7148fb4ed2 100644 --- a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.22.yaml +++ b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.22.yaml @@ -158,6 +158,8 @@ tests: steps: cluster_profile: openshift-org-aws env: + COMPUTE_NODE_TYPE: m6a.2xlarge + CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge FIPS_ENABLED: "true" pre: - chain: ipi-aws-pre diff --git a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.23.yaml b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.23.yaml index c12a45b477bf4..42335ae474009 100644 --- a/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.23.yaml +++ b/ci-operator/config/openshift-priv/machine-config-operator/openshift-priv-machine-config-operator-release-4.23.yaml @@ -162,6 +162,8 @@ tests: steps: cluster_profile: openshift-org-aws env: + COMPUTE_NODE_TYPE: m6a.2xlarge + CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge FIPS_ENABLED: "true" pre: - chain: ipi-aws-pre diff --git a/ci-operator/config/openshift-priv/origin/openshift-priv-origin-main.yaml b/ci-operator/config/openshift-priv/origin/openshift-priv-origin-main.yaml index 5da7adfc81f52..83128cfa9e50f 100644 --- a/ci-operator/config/openshift-priv/origin/openshift-priv-origin-main.yaml +++ b/ci-operator/config/openshift-priv/origin/openshift-priv-origin-main.yaml @@ -402,6 +402,8 @@ tests: steps: cluster_profile: openshift-org-aws env: + COMPUTE_NODE_TYPE: m6a.2xlarge + CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge FIPS_ENABLED: "true" TEST_REQUIRES_BUILDFARM_NET_ADMIN: "true" TEST_SUITE: openshift/conformance/parallel diff --git a/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.22.yaml b/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.22.yaml index 4a36863b3c12c..9c8a0739eddc6 100644 --- a/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.22.yaml +++ b/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.22.yaml @@ -402,6 +402,8 @@ tests: steps: cluster_profile: openshift-org-aws env: + COMPUTE_NODE_TYPE: m6a.2xlarge + CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge FIPS_ENABLED: "true" TEST_REQUIRES_BUILDFARM_NET_ADMIN: "true" TEST_SUITE: openshift/conformance/parallel diff --git a/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.23.yaml b/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.23.yaml index 1862034dfdf00..070fedce3bdf5 100644 --- a/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.23.yaml +++ b/ci-operator/config/openshift-priv/origin/openshift-priv-origin-release-4.23.yaml @@ -402,6 +402,8 @@ tests: steps: cluster_profile: openshift-org-aws env: + COMPUTE_NODE_TYPE: m6a.2xlarge + CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge FIPS_ENABLED: "true" TEST_REQUIRES_BUILDFARM_NET_ADMIN: "true" TEST_SUITE: openshift/conformance/parallel diff --git a/ci-operator/config/openshift/installer/openshift-installer-main.yaml b/ci-operator/config/openshift/installer/openshift-installer-main.yaml index 39a9d7967f503..c3de79735c1be 100644 --- a/ci-operator/config/openshift/installer/openshift-installer-main.yaml +++ b/ci-operator/config/openshift/installer/openshift-installer-main.yaml @@ -1134,6 +1134,8 @@ tests: steps: cluster_profile: openshift-org-aws env: + COMPUTE_NODE_TYPE: m6a.2xlarge + CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge FIPS_ENABLED: "true" TEST_SUITE: openshift/conformance/parallel pre: diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.22.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.22.yaml index ccf2f11350a3c..1e130ea21e24a 100644 --- a/ci-operator/config/openshift/installer/openshift-installer-release-4.22.yaml +++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.22.yaml @@ -1112,6 +1112,8 @@ tests: steps: cluster_profile: openshift-org-aws env: + COMPUTE_NODE_TYPE: m6a.2xlarge + CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge FIPS_ENABLED: "true" TEST_SUITE: openshift/conformance/parallel pre: diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.23.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.23.yaml index 5e05664f6a765..f3eda9b9e23ac 100644 --- a/ci-operator/config/openshift/installer/openshift-installer-release-4.23.yaml +++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.23.yaml @@ -1116,6 +1116,8 @@ tests: steps: cluster_profile: openshift-org-aws env: + COMPUTE_NODE_TYPE: m6a.2xlarge + CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge FIPS_ENABLED: "true" TEST_SUITE: openshift/conformance/parallel pre: diff --git a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml index d8d0f1ef945f5..47d00aadb7d86 100644 --- a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml +++ b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml @@ -459,6 +459,8 @@ tests: steps: cluster_profile: openshift-org-aws env: + COMPUTE_NODE_TYPE: m6a.2xlarge + CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge FIPS_ENABLED: "true" TEST_SUITE: openshift/conformance/parallel pre: diff --git a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.22.yaml b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.22.yaml index 710865c8a1c1b..85204f990a4ec 100644 --- a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.22.yaml +++ b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.22.yaml @@ -428,6 +428,8 @@ tests: steps: cluster_profile: openshift-org-aws env: + COMPUTE_NODE_TYPE: m6a.2xlarge + CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge FIPS_ENABLED: "true" TEST_SUITE: openshift/conformance/parallel pre: diff --git a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.23.yaml b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.23.yaml index 8629dcd3789ff..ea3a187d29217 100644 --- a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.23.yaml +++ b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.23.yaml @@ -434,6 +434,8 @@ tests: steps: cluster_profile: openshift-org-aws env: + COMPUTE_NODE_TYPE: m6a.2xlarge + CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge FIPS_ENABLED: "true" TEST_SUITE: openshift/conformance/parallel pre: diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-main.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-main.yaml index 5b90b6fed1a1d..bcc832ffb88bb 100644 --- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-main.yaml +++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-main.yaml @@ -159,6 +159,8 @@ tests: steps: cluster_profile: openshift-org-aws env: + COMPUTE_NODE_TYPE: m6a.2xlarge + CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge FIPS_ENABLED: "true" pre: - chain: ipi-aws-pre diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.22.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.22.yaml index f9fcad41fd6d9..bd9b8bdb2f11a 100644 --- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.22.yaml +++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.22.yaml @@ -155,6 +155,8 @@ tests: steps: cluster_profile: openshift-org-aws env: + COMPUTE_NODE_TYPE: m6a.2xlarge + CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge FIPS_ENABLED: "true" pre: - chain: ipi-aws-pre diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.23.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.23.yaml index cb094c87802f6..a262968f193fc 100644 --- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.23.yaml +++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.23.yaml @@ -159,6 +159,8 @@ tests: steps: cluster_profile: openshift-org-aws env: + COMPUTE_NODE_TYPE: m6a.2xlarge + CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge FIPS_ENABLED: "true" pre: - chain: ipi-aws-pre diff --git a/ci-operator/config/openshift/origin/openshift-origin-main.yaml b/ci-operator/config/openshift/origin/openshift-origin-main.yaml index d55ced2e03bbf..a868be34638f3 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-main.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-main.yaml @@ -415,6 +415,8 @@ tests: steps: cluster_profile: openshift-org-aws env: + COMPUTE_NODE_TYPE: m6a.2xlarge + CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge FIPS_ENABLED: "true" TEST_REQUIRES_BUILDFARM_NET_ADMIN: "true" TEST_SUITE: openshift/conformance/parallel diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.22.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.22.yaml index eaa9196dcca33..b49d18d9b6bd0 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.22.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.22.yaml @@ -399,6 +399,8 @@ tests: steps: cluster_profile: openshift-org-aws env: + COMPUTE_NODE_TYPE: m6a.2xlarge + CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge FIPS_ENABLED: "true" TEST_REQUIRES_BUILDFARM_NET_ADMIN: "true" TEST_SUITE: openshift/conformance/parallel diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.23.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.23.yaml index 6b3c27947a4d9..a735308b0dd20 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.23.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.23.yaml @@ -399,6 +399,8 @@ tests: steps: cluster_profile: openshift-org-aws env: + COMPUTE_NODE_TYPE: m6a.2xlarge + CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge FIPS_ENABLED: "true" TEST_REQUIRES_BUILDFARM_NET_ADMIN: "true" TEST_SUITE: openshift/conformance/parallel diff --git a/ci-operator/config/openshift/release/openshift-release-main__nightly-4.22.yaml b/ci-operator/config/openshift/release/openshift-release-main__nightly-4.22.yaml index cf3591ba62d2e..b14096dfd4750 100644 --- a/ci-operator/config/openshift/release/openshift-release-main__nightly-4.22.yaml +++ b/ci-operator/config/openshift/release/openshift-release-main__nightly-4.22.yaml @@ -1393,6 +1393,8 @@ tests: steps: cluster_profile: openshift-org-aws env: + COMPUTE_NODE_TYPE: m6a.2xlarge + CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge DEBUG_ENABLE_TCPDUMP: "true" FIPS_ENABLED: "true" TEST_REQUIRES_BUILDFARM_NET_ADMIN: "true" @@ -1472,6 +1474,8 @@ tests: steps: cluster_profile: openshift-org-aws env: + COMPUTE_NODE_TYPE: m6a.2xlarge + CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge FIPS_ENABLED: "true" TEST_SUITE: openshift/conformance/serial observers: diff --git a/ci-operator/config/openshift/release/openshift-release-main__nightly-4.23.yaml b/ci-operator/config/openshift/release/openshift-release-main__nightly-4.23.yaml index ab4320406ea9a..d943f578d995f 100644 --- a/ci-operator/config/openshift/release/openshift-release-main__nightly-4.23.yaml +++ b/ci-operator/config/openshift/release/openshift-release-main__nightly-4.23.yaml @@ -1367,6 +1367,8 @@ tests: steps: cluster_profile: openshift-org-aws env: + COMPUTE_NODE_TYPE: m6a.2xlarge + CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge DEBUG_ENABLE_TCPDUMP: "true" FIPS_ENABLED: "true" TEST_REQUIRES_BUILDFARM_NET_ADMIN: "true" @@ -1446,6 +1448,8 @@ tests: steps: cluster_profile: openshift-org-aws env: + COMPUTE_NODE_TYPE: m6a.2xlarge + CONTROL_PLANE_INSTANCE_TYPE: m6a.2xlarge FIPS_ENABLED: "true" TEST_SUITE: openshift/conformance/serial observers: