Skip to content

Commit 6052557

Browse files
authored
Refactor openshift e2e aws capi workflow (#78001)
* Add openshift-oc-wait-for-stable-cluster step to step-registry Configurable wrapper around oc adm wait-for-stable-cluster for use as a reusable step in CI workflows. Supports MINIMUM_STABLE_PERIOD and TIMEOUT env vars. Intended for use after cluster state changes such as enabling FeatureSets post-install. * Update openshift-e2e-aws-capi workflow to use shared steps Replace capi-conf-apply-feature-gate with ipi-install-post-featureset and openshift-oc-wait-for-stable-cluster. This uses the standard post-install FeatureSet enablement step and a proper cluster stability check instead of a custom script with hand-rolled operator waits. * Rename openshift-e2e-aws-capi workflow to openshift-e2e-aws-techpreview-post-install The old name implied this was CAPI-specific, but the workflow actually tests the day-1 TechPreview enablement path on a standard AWS cluster. The new name clearly distinguishes it from the day-0 variant (openshift-e2e-aws-techpreview) which installs with TechPreview from the start. * Rename cluster-machine-approver e2e-aws-capi-techpreview to e2e-aws-techpreview-post-install Align the job name with the renamed workflow. The test enables TechPreview post-install, not CAPI specifically. * Keep openshift-e2e-aws-capi workflow for releases 4.11-4.13 Releases 4.11-4.13 use a CLI that may not include oc adm wait-for-stable-cluster, so keep them on the original openshift-e2e-aws-capi workflow with capi-conf-apply-feature-gate. Also add a runtime check to openshift-oc-wait-for-stable-cluster to fail gracefully when the subcommand is not available.
1 parent 844737c commit 6052557

85 files changed

Lines changed: 595 additions & 513 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

ci-operator/config/openshift-priv/cluster-api-operator/openshift-priv-cluster-api-operator-release-4.14.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ tests:
4646
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
4747
steps:
4848
cluster_profile: openshift-org-aws
49-
workflow: openshift-e2e-aws-capi
49+
workflow: openshift-e2e-aws-techpreview-post-install
5050
- as: e2e-gcp-ovn-techpreview
5151
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
5252
steps:

ci-operator/config/openshift-priv/cluster-api-operator/openshift-priv-cluster-api-operator-release-4.15.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ tests:
4545
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
4646
steps:
4747
cluster_profile: openshift-org-aws
48-
workflow: openshift-e2e-aws-capi
48+
workflow: openshift-e2e-aws-techpreview-post-install
4949
- as: e2e-gcp-ovn-techpreview
5050
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
5151
steps:

ci-operator/config/openshift-priv/cluster-api-operator/openshift-priv-cluster-api-operator-release-4.16.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ tests:
4242
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
4343
steps:
4444
cluster_profile: openshift-org-aws
45-
workflow: openshift-e2e-aws-capi
45+
workflow: openshift-e2e-aws-techpreview-post-install
4646
- as: e2e-gcp-ovn-techpreview
4747
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
4848
steps:

ci-operator/config/openshift-priv/cluster-api-operator/openshift-priv-cluster-api-operator-release-4.17.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ tests:
4242
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
4343
steps:
4444
cluster_profile: openshift-org-aws
45-
workflow: openshift-e2e-aws-capi
45+
workflow: openshift-e2e-aws-techpreview-post-install
4646
- as: e2e-gcp-ovn-techpreview
4747
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
4848
steps:

ci-operator/config/openshift-priv/cluster-api-operator/openshift-priv-cluster-api-operator-release-4.18.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ tests:
4242
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
4343
steps:
4444
cluster_profile: openshift-org-aws
45-
workflow: openshift-e2e-aws-capi
45+
workflow: openshift-e2e-aws-techpreview-post-install
4646
- as: e2e-gcp-ovn-techpreview
4747
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
4848
steps:

ci-operator/config/openshift-priv/cluster-api-operator/openshift-priv-cluster-api-operator-release-4.19.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ tests:
4242
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
4343
steps:
4444
cluster_profile: openshift-org-aws
45-
workflow: openshift-e2e-aws-capi
45+
workflow: openshift-e2e-aws-techpreview-post-install
4646
- as: e2e-gcp-ovn-techpreview
4747
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
4848
steps:

ci-operator/config/openshift-priv/cluster-api-operator/openshift-priv-cluster-api-operator-release-4.20.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ tests:
4242
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
4343
steps:
4444
cluster_profile: openshift-org-aws
45-
workflow: openshift-e2e-aws-capi
45+
workflow: openshift-e2e-aws-techpreview-post-install
4646
- as: e2e-gcp-ovn-techpreview
4747
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
4848
steps:

ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-main.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,11 @@ tests:
9292
steps:
9393
cluster_profile: openshift-org-aws
9494
workflow: openshift-upgrade-aws
95-
- as: e2e-aws-capi-techpreview
95+
- as: e2e-aws-techpreview-post-install
9696
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
9797
steps:
9898
cluster_profile: openshift-org-aws
99-
workflow: openshift-e2e-aws-capi
99+
workflow: openshift-e2e-aws-techpreview-post-install
100100
- as: e2e-hypershift-aws
101101
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
102102
steps:

ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.11.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ tests:
8989
steps:
9090
cluster_profile: openshift-org-aws
9191
workflow: openshift-e2e-aws-disruption
92-
- as: e2e-aws-capi-techpreview
92+
- as: e2e-aws-techpreview-post-install
9393
steps:
9494
cluster_profile: openshift-org-aws
9595
workflow: openshift-e2e-aws-capi

ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.12.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ tests:
8383
steps:
8484
cluster_profile: openshift-org-aws
8585
workflow: openshift-upgrade-aws
86-
- as: e2e-aws-capi-techpreview
86+
- as: e2e-aws-techpreview-post-install
8787
steps:
8888
cluster_profile: openshift-org-aws
8989
workflow: openshift-e2e-aws-capi

0 commit comments

Comments
 (0)