From 323812e28f26d946ae49ae32d980b8e8e71365ca Mon Sep 17 00:00:00 2001 From: Rafael Fonseca Date: Tue, 23 Jul 2024 23:42:01 +0200 Subject: [PATCH] Revert "installer / CAPI / master, 4.17, 4.16: AWS spot instances (#51721)" This partially reverts commit b95bb0091ea4a6585ae1f97d4bde09cffbbc0964. We are seeing multiples cases of Spot instances being reclaimed during the cluster install, causing job failures. --- .../installer/openshift-installer-master.yaml | 25 ------------------- .../openshift-installer-master__altinfra.yaml | 24 ------------------ .../openshift-installer-release-4.16.yaml | 25 ------------------- ...hift-installer-release-4.16__altinfra.yaml | 24 ------------------ .../openshift-installer-release-4.17.yaml | 25 ------------------- ...hift-installer-release-4.17__altinfra.yaml | 24 ------------------ .../openshift-installer-release-4.18.yaml | 25 ------------------- ...hift-installer-release-4.18__altinfra.yaml | 24 ------------------ 8 files changed, 196 deletions(-) diff --git a/ci-operator/config/openshift/installer/openshift-installer-master.yaml b/ci-operator/config/openshift/installer/openshift-installer-master.yaml index cae46d408a8c3..f7c564b966693 100644 --- a/ci-operator/config/openshift/installer/openshift-installer-master.yaml +++ b/ci-operator/config/openshift/installer/openshift-installer-master.yaml @@ -308,8 +308,6 @@ tests: steps: cluster_profile: aws env: - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" USER_TAGS: | keyA valueA keyB valueB @@ -334,9 +332,6 @@ tests: optional: true steps: cluster_profile: aws - env: - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-proxy timeout: 6h0m0s - always_run: false @@ -351,9 +346,6 @@ tests: run_if_changed: aws steps: cluster_profile: aws - env: - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" post: - chain: ipi-aws-post - ref: ipi-deprovision-aws-custom-security-groups @@ -397,8 +389,6 @@ tests: cluster_profile: aws env: AWS_METADATA_SERVICE_AUTH: Required - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws timeout: 6h0m0s - as: e2e-gcp-ovn @@ -463,9 +453,6 @@ tests: optional: true steps: cluster_profile: aws - env: - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-upgrade-aws-latestinstaller timeout: 6h0m0s - as: e2e-aws-ovn-upi @@ -507,8 +494,6 @@ tests: cluster_profile: aws env: PLATFORM_VERSION: "8.4" - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-workers-rhel timeout: 6h0m0s - always_run: false @@ -751,9 +736,6 @@ tests: run_if_changed: aws steps: cluster_profile: aws - env: - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-single-node timeout: 6h0m0s - as: e2e-metal-single-node-live-iso @@ -770,8 +752,6 @@ tests: cluster_profile: aws env: FIPS_ENABLED: "true" - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" TEST_SUITE: openshift/conformance/parallel pre: - chain: ipi-aws-pre @@ -891,9 +871,6 @@ tests: run_if_changed: /aws/subnet.go steps: cluster_profile: aws - env: - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-publicsubnets timeout: 6h0m0s - always_run: false @@ -909,8 +886,6 @@ tests: cluster_profile: aws env: CLUSTER_NETWORK_MTU: "1200" - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-network-mtu timeout: 6h0m0s - always_run: false diff --git a/ci-operator/config/openshift/installer/openshift-installer-master__altinfra.yaml b/ci-operator/config/openshift/installer/openshift-installer-master__altinfra.yaml index 62b821fa8131f..0eb0c10f4d9d7 100644 --- a/ci-operator/config/openshift/installer/openshift-installer-master__altinfra.yaml +++ b/ci-operator/config/openshift/installer/openshift-installer-master__altinfra.yaml @@ -97,8 +97,6 @@ tests: env: FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-custom-security-groups timeout: 6h0m0s - always_run: false @@ -110,8 +108,6 @@ tests: env: FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" USER_TAGS: | keyA valueA keyB valueB @@ -127,8 +123,6 @@ tests: FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade FIPS_ENABLED: "true" - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" TEST_SUITE: openshift/conformance/parallel pre: - chain: ipi-aws-pre @@ -146,8 +140,6 @@ tests: AWS_METADATA_SERVICE_AUTH: Required FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws timeout: 6h0m0s - always_run: false @@ -158,8 +150,6 @@ tests: env: FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-proxy timeout: 6h0m0s - always_run: false @@ -170,8 +160,6 @@ tests: env: FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" USER_TAGS: | keyA valueA keyB valueB @@ -189,8 +177,6 @@ tests: env: FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-sharednetwork timeout: 6h0m0s - always_run: false @@ -201,8 +187,6 @@ tests: env: FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-single-node timeout: 6h0m0s - always_run: false @@ -214,8 +198,6 @@ tests: EDGE_ZONE_TYPES: local-zone FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-edge-zones timeout: 6h0m0s - always_run: false @@ -227,8 +209,6 @@ tests: EDGE_ZONE_TYPES: wavelength-zone FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-edge-zones timeout: 6h0m0s - always_run: false @@ -240,8 +220,6 @@ tests: EDGE_ZONE_TYPES: local-zone FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-edge-zones-byo-vpc timeout: 6h0m0s - always_run: false @@ -253,8 +231,6 @@ tests: EDGE_ZONE_TYPES: wavelength-zone FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-edge-zones-byo-vpc timeout: 6h0m0s - always_run: false diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.16.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.16.yaml index c299d883a1028..b1731bc6c20b4 100644 --- a/ci-operator/config/openshift/installer/openshift-installer-release-4.16.yaml +++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.16.yaml @@ -307,8 +307,6 @@ tests: steps: cluster_profile: aws env: - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" USER_TAGS: | keyA valueA keyB valueB @@ -320,9 +318,6 @@ tests: optional: true steps: cluster_profile: aws - env: - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-proxy timeout: 6h0m0s - always_run: false @@ -337,9 +332,6 @@ tests: run_if_changed: aws steps: cluster_profile: aws - env: - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" post: - chain: ipi-aws-post - ref: ipi-deprovision-aws-custom-security-groups @@ -383,8 +375,6 @@ tests: cluster_profile: aws env: AWS_METADATA_SERVICE_AUTH: Required - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws timeout: 6h0m0s - as: e2e-gcp-ovn @@ -431,9 +421,6 @@ tests: optional: true steps: cluster_profile: aws - env: - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-upgrade-aws-latestinstaller timeout: 6h0m0s - as: e2e-aws-ovn-upi @@ -475,8 +462,6 @@ tests: cluster_profile: aws env: PLATFORM_VERSION: "8.4" - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-workers-rhel timeout: 6h0m0s - always_run: false @@ -696,9 +681,6 @@ tests: run_if_changed: aws steps: cluster_profile: aws - env: - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-single-node timeout: 6h0m0s - as: e2e-metal-single-node-live-iso @@ -715,8 +697,6 @@ tests: cluster_profile: aws env: FIPS_ENABLED: "true" - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" TEST_SUITE: openshift/conformance/parallel pre: - chain: ipi-aws-pre @@ -828,9 +808,6 @@ tests: run_if_changed: /aws/subnet.go steps: cluster_profile: aws - env: - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-publicsubnets timeout: 6h0m0s - always_run: false @@ -846,8 +823,6 @@ tests: cluster_profile: aws env: CLUSTER_NETWORK_MTU: "1200" - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-network-mtu timeout: 6h0m0s - always_run: false diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.16__altinfra.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.16__altinfra.yaml index c4318f25596a7..ea5c0c568f1cb 100644 --- a/ci-operator/config/openshift/installer/openshift-installer-release-4.16__altinfra.yaml +++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.16__altinfra.yaml @@ -97,8 +97,6 @@ tests: env: FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-custom-security-groups timeout: 6h0m0s - always_run: false @@ -110,8 +108,6 @@ tests: env: FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" USER_TAGS: | keyA valueA keyB valueB @@ -127,8 +123,6 @@ tests: FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade FIPS_ENABLED: "true" - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" TEST_SUITE: openshift/conformance/parallel pre: - chain: ipi-aws-pre @@ -146,8 +140,6 @@ tests: AWS_METADATA_SERVICE_AUTH: Required FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws timeout: 6h0m0s - always_run: false @@ -158,8 +150,6 @@ tests: env: FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-proxy timeout: 6h0m0s - always_run: false @@ -170,8 +160,6 @@ tests: env: FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" USER_TAGS: | keyA valueA keyB valueB @@ -189,8 +177,6 @@ tests: env: FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-sharednetwork timeout: 6h0m0s - always_run: false @@ -201,8 +187,6 @@ tests: env: FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-single-node timeout: 6h0m0s - always_run: false @@ -214,8 +198,6 @@ tests: EDGE_ZONE_TYPES: local-zone FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-edge-zones timeout: 6h0m0s - always_run: false @@ -227,8 +209,6 @@ tests: EDGE_ZONE_TYPES: wavelength-zone FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-edge-zones timeout: 6h0m0s - always_run: false @@ -240,8 +220,6 @@ tests: EDGE_ZONE_TYPES: local-zone FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-edge-zones-byo-vpc timeout: 6h0m0s - always_run: false @@ -253,8 +231,6 @@ tests: EDGE_ZONE_TYPES: wavelength-zone FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-edge-zones-byo-vpc timeout: 6h0m0s - always_run: false diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.17.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.17.yaml index 687729782ea51..361f36eb1b0d5 100644 --- a/ci-operator/config/openshift/installer/openshift-installer-release-4.17.yaml +++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.17.yaml @@ -309,8 +309,6 @@ tests: steps: cluster_profile: aws env: - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" USER_TAGS: | keyA valueA keyB valueB @@ -335,9 +333,6 @@ tests: optional: true steps: cluster_profile: aws - env: - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-proxy timeout: 6h0m0s - always_run: false @@ -352,9 +347,6 @@ tests: run_if_changed: aws steps: cluster_profile: aws - env: - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" post: - chain: ipi-aws-post - ref: ipi-deprovision-aws-custom-security-groups @@ -398,8 +390,6 @@ tests: cluster_profile: aws env: AWS_METADATA_SERVICE_AUTH: Required - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws timeout: 6h0m0s - as: e2e-gcp-ovn @@ -464,9 +454,6 @@ tests: optional: true steps: cluster_profile: aws - env: - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-upgrade-aws-latestinstaller timeout: 6h0m0s - as: e2e-aws-ovn-upi @@ -508,8 +495,6 @@ tests: cluster_profile: aws env: PLATFORM_VERSION: "8.4" - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-workers-rhel timeout: 6h0m0s - always_run: false @@ -752,9 +737,6 @@ tests: run_if_changed: aws steps: cluster_profile: aws - env: - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-single-node timeout: 6h0m0s - as: e2e-metal-single-node-live-iso @@ -771,8 +753,6 @@ tests: cluster_profile: aws env: FIPS_ENABLED: "true" - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" TEST_SUITE: openshift/conformance/parallel pre: - chain: ipi-aws-pre @@ -892,9 +872,6 @@ tests: run_if_changed: /aws/subnet.go steps: cluster_profile: aws - env: - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-publicsubnets timeout: 6h0m0s - always_run: false @@ -910,8 +887,6 @@ tests: cluster_profile: aws env: CLUSTER_NETWORK_MTU: "1200" - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-network-mtu timeout: 6h0m0s - always_run: false diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.17__altinfra.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.17__altinfra.yaml index a17dad6dbcdfa..51fc4dd284e2e 100644 --- a/ci-operator/config/openshift/installer/openshift-installer-release-4.17__altinfra.yaml +++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.17__altinfra.yaml @@ -98,8 +98,6 @@ tests: env: FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-custom-security-groups timeout: 6h0m0s - always_run: false @@ -111,8 +109,6 @@ tests: env: FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" USER_TAGS: | keyA valueA keyB valueB @@ -128,8 +124,6 @@ tests: FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade FIPS_ENABLED: "true" - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" TEST_SUITE: openshift/conformance/parallel pre: - chain: ipi-aws-pre @@ -147,8 +141,6 @@ tests: AWS_METADATA_SERVICE_AUTH: Required FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws timeout: 6h0m0s - always_run: false @@ -159,8 +151,6 @@ tests: env: FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-proxy timeout: 6h0m0s - always_run: false @@ -171,8 +161,6 @@ tests: env: FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" USER_TAGS: | keyA valueA keyB valueB @@ -190,8 +178,6 @@ tests: env: FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-sharednetwork timeout: 6h0m0s - always_run: false @@ -202,8 +188,6 @@ tests: env: FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-single-node timeout: 6h0m0s - always_run: false @@ -215,8 +199,6 @@ tests: EDGE_ZONE_TYPES: local-zone FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-edge-zones timeout: 6h0m0s - always_run: false @@ -228,8 +210,6 @@ tests: EDGE_ZONE_TYPES: wavelength-zone FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-edge-zones timeout: 6h0m0s - always_run: false @@ -241,8 +221,6 @@ tests: EDGE_ZONE_TYPES: local-zone FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-edge-zones-byo-vpc timeout: 6h0m0s - always_run: false @@ -254,8 +232,6 @@ tests: EDGE_ZONE_TYPES: wavelength-zone FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-edge-zones-byo-vpc timeout: 6h0m0s - always_run: false diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.18.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.18.yaml index 922b6dece848b..1a0cac20c2d31 100644 --- a/ci-operator/config/openshift/installer/openshift-installer-release-4.18.yaml +++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.18.yaml @@ -308,8 +308,6 @@ tests: steps: cluster_profile: aws env: - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" USER_TAGS: | keyA valueA keyB valueB @@ -334,9 +332,6 @@ tests: optional: true steps: cluster_profile: aws - env: - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-proxy timeout: 6h0m0s - always_run: false @@ -351,9 +346,6 @@ tests: run_if_changed: aws steps: cluster_profile: aws - env: - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" post: - chain: ipi-aws-post - ref: ipi-deprovision-aws-custom-security-groups @@ -397,8 +389,6 @@ tests: cluster_profile: aws env: AWS_METADATA_SERVICE_AUTH: Required - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws timeout: 6h0m0s - as: e2e-gcp-ovn @@ -463,9 +453,6 @@ tests: optional: true steps: cluster_profile: aws - env: - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-upgrade-aws-latestinstaller timeout: 6h0m0s - as: e2e-aws-ovn-upi @@ -507,8 +494,6 @@ tests: cluster_profile: aws env: PLATFORM_VERSION: "8.4" - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-workers-rhel timeout: 6h0m0s - always_run: false @@ -751,9 +736,6 @@ tests: run_if_changed: aws steps: cluster_profile: aws - env: - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-single-node timeout: 6h0m0s - as: e2e-metal-single-node-live-iso @@ -770,8 +752,6 @@ tests: cluster_profile: aws env: FIPS_ENABLED: "true" - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" TEST_SUITE: openshift/conformance/parallel pre: - chain: ipi-aws-pre @@ -891,9 +871,6 @@ tests: run_if_changed: /aws/subnet.go steps: cluster_profile: aws - env: - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-publicsubnets timeout: 6h0m0s - always_run: false @@ -909,8 +886,6 @@ tests: cluster_profile: aws env: CLUSTER_NETWORK_MTU: "1200" - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-network-mtu timeout: 6h0m0s - always_run: false diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.18__altinfra.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.18__altinfra.yaml index 3bcc04481aa7f..9fbcf97ee6efc 100644 --- a/ci-operator/config/openshift/installer/openshift-installer-release-4.18__altinfra.yaml +++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.18__altinfra.yaml @@ -97,8 +97,6 @@ tests: env: FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-custom-security-groups timeout: 6h0m0s - always_run: false @@ -110,8 +108,6 @@ tests: env: FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" USER_TAGS: | keyA valueA keyB valueB @@ -127,8 +123,6 @@ tests: FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade FIPS_ENABLED: "true" - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" TEST_SUITE: openshift/conformance/parallel pre: - chain: ipi-aws-pre @@ -146,8 +140,6 @@ tests: AWS_METADATA_SERVICE_AUTH: Required FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws timeout: 6h0m0s - always_run: false @@ -158,8 +150,6 @@ tests: env: FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-proxy timeout: 6h0m0s - always_run: false @@ -170,8 +160,6 @@ tests: env: FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" USER_TAGS: | keyA valueA keyB valueB @@ -189,8 +177,6 @@ tests: env: FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-sharednetwork timeout: 6h0m0s - always_run: false @@ -201,8 +187,6 @@ tests: env: FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-single-node timeout: 6h0m0s - always_run: false @@ -214,8 +198,6 @@ tests: EDGE_ZONE_TYPES: local-zone FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-edge-zones timeout: 6h0m0s - always_run: false @@ -227,8 +209,6 @@ tests: EDGE_ZONE_TYPES: wavelength-zone FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-edge-zones timeout: 6h0m0s - always_run: false @@ -240,8 +220,6 @@ tests: EDGE_ZONE_TYPES: local-zone FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-edge-zones-byo-vpc timeout: 6h0m0s - always_run: false @@ -253,8 +231,6 @@ tests: EDGE_ZONE_TYPES: wavelength-zone FEATURE_GATES: '["ClusterAPIInstall=true"]' FEATURE_SET: CustomNoUpgrade - SPOT_INSTANCES: "true" - SPOT_MASTERS: "true" workflow: openshift-e2e-aws-edge-zones-byo-vpc timeout: 6h0m0s - always_run: false