Skip to content

Revert "installer / CAPI / master, 4.17, 4.16: AWS spot instances (#5… #54724

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Jul 24, 2024
Merged

Revert "installer / CAPI / master, 4.17, 4.16: AWS spot instances (#5… #54724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 0 additions & 25 deletions ci-operator/config/openshift/installer/openshift-installer-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,8 +308,6 @@ tests:
steps:
cluster_profile: aws
env:
SPOT_INSTANCES: "true"
SPOT_MASTERS: "true"
USER_TAGS: |
keyA valueA
keyB valueB
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
24 changes: 0 additions & 24 deletions ci-operator/config/openshift/installer/openshift-installer-master__altinfra.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
25 changes: 0 additions & 25 deletions ci-operator/config/openshift/installer/openshift-installer-release-4.16.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,8 +307,6 @@ tests:
steps:
cluster_profile: aws
env:
SPOT_INSTANCES: "true"
SPOT_MASTERS: "true"
USER_TAGS: |
keyA valueA
keyB valueB
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
Loading