From e84b0009ea069d3db2e2b10b4b6cad0c6a8935b2 Mon Sep 17 00:00:00 2001 From: Damiano Donati Date: Sat, 18 Apr 2026 16:46:36 +0200 Subject: [PATCH 1/5] 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. --- .../oc/wait-for-stable-cluster/OWNERS | 1 + ...ift-oc-wait-for-stable-cluster-commands.sh | 9 ++++++++ ...-wait-for-stable-cluster-ref.metadata.json | 13 ++++++++++++ ...nshift-oc-wait-for-stable-cluster-ref.yaml | 21 +++++++++++++++++++ 4 files changed, 44 insertions(+) create mode 120000 ci-operator/step-registry/openshift/oc/wait-for-stable-cluster/OWNERS create mode 100755 ci-operator/step-registry/openshift/oc/wait-for-stable-cluster/openshift-oc-wait-for-stable-cluster-commands.sh create mode 100644 ci-operator/step-registry/openshift/oc/wait-for-stable-cluster/openshift-oc-wait-for-stable-cluster-ref.metadata.json create mode 100644 ci-operator/step-registry/openshift/oc/wait-for-stable-cluster/openshift-oc-wait-for-stable-cluster-ref.yaml diff --git a/ci-operator/step-registry/openshift/oc/wait-for-stable-cluster/OWNERS b/ci-operator/step-registry/openshift/oc/wait-for-stable-cluster/OWNERS new file mode 120000 index 0000000000000..ec405d65a79df --- /dev/null +++ b/ci-operator/step-registry/openshift/oc/wait-for-stable-cluster/OWNERS @@ -0,0 +1 @@ +../OWNERS \ No newline at end of file diff --git a/ci-operator/step-registry/openshift/oc/wait-for-stable-cluster/openshift-oc-wait-for-stable-cluster-commands.sh b/ci-operator/step-registry/openshift/oc/wait-for-stable-cluster/openshift-oc-wait-for-stable-cluster-commands.sh new file mode 100755 index 0000000000000..f8c4c9dbf7dd0 --- /dev/null +++ b/ci-operator/step-registry/openshift/oc/wait-for-stable-cluster/openshift-oc-wait-for-stable-cluster-commands.sh @@ -0,0 +1,9 @@ +#!/bin/bash +set -euo pipefail + +if test -f "${SHARED_DIR}/proxy-conf.sh"; then + # shellcheck disable=SC1090 + source "${SHARED_DIR}/proxy-conf.sh" +fi + +oc adm wait-for-stable-cluster --minimum-stable-period="${MINIMUM_STABLE_PERIOD}" --timeout="${TIMEOUT}" diff --git a/ci-operator/step-registry/openshift/oc/wait-for-stable-cluster/openshift-oc-wait-for-stable-cluster-ref.metadata.json b/ci-operator/step-registry/openshift/oc/wait-for-stable-cluster/openshift-oc-wait-for-stable-cluster-ref.metadata.json new file mode 100644 index 0000000000000..dbb2da6cfeb5c --- /dev/null +++ b/ci-operator/step-registry/openshift/oc/wait-for-stable-cluster/openshift-oc-wait-for-stable-cluster-ref.metadata.json @@ -0,0 +1,13 @@ +{ + "path": "openshift/oc/wait-for-stable-cluster/openshift-oc-wait-for-stable-cluster-ref.yaml", + "owners": { + "approvers": [ + "deads2k", + "p0lyn0mial", + "benluddy", + "vrutkovs", + "ingvagabund", + "bertinatto" + ] + } +} \ No newline at end of file diff --git a/ci-operator/step-registry/openshift/oc/wait-for-stable-cluster/openshift-oc-wait-for-stable-cluster-ref.yaml b/ci-operator/step-registry/openshift/oc/wait-for-stable-cluster/openshift-oc-wait-for-stable-cluster-ref.yaml new file mode 100644 index 0000000000000..8bd0630746d1b --- /dev/null +++ b/ci-operator/step-registry/openshift/oc/wait-for-stable-cluster/openshift-oc-wait-for-stable-cluster-ref.yaml @@ -0,0 +1,21 @@ +ref: + as: openshift-oc-wait-for-stable-cluster + from: cli + commands: openshift-oc-wait-for-stable-cluster-commands.sh + resources: + requests: + cpu: 100m + memory: 100Mi + env: + - name: MINIMUM_STABLE_PERIOD + default: "2m" + documentation: |- + Minimum duration the cluster must remain stable before the check passes. + - name: TIMEOUT + default: "30m" + documentation: |- + Maximum time to wait for the cluster to become stable before failing. + documentation: |- + Wait for all cluster operators to become stable using oc adm wait-for-stable-cluster. + The step succeeds when every cluster operator has been Available=True, + Progressing=False and Degraded=False for at least MINIMUM_STABLE_PERIOD. From f873b49943e2bb77b603f45556dc5a559cb1d49c Mon Sep 17 00:00:00 2001 From: Damiano Donati Date: Sat, 18 Apr 2026 16:50:03 +0200 Subject: [PATCH 2/5] 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. --- .../e2e/aws/capi/openshift-e2e-aws-capi-workflow.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci-operator/step-registry/openshift/e2e/aws/capi/openshift-e2e-aws-capi-workflow.yaml b/ci-operator/step-registry/openshift/e2e/aws/capi/openshift-e2e-aws-capi-workflow.yaml index cc6ead0356240..f935b375a05da 100644 --- a/ci-operator/step-registry/openshift/e2e/aws/capi/openshift-e2e-aws-capi-workflow.yaml +++ b/ci-operator/step-registry/openshift/e2e/aws/capi/openshift-e2e-aws-capi-workflow.yaml @@ -6,7 +6,8 @@ workflow: - ref: ipi-conf-telemetry - ref: ipi-conf-aws - chain: ipi-install - - ref: capi-conf-apply-feature-gate + - ref: ipi-install-post-featureset + - ref: openshift-oc-wait-for-stable-cluster test: - ref: openshift-e2e-test post: From 4dc3fbf953e1b37e04f4b395bc016586b16a54d9 Mon Sep 17 00:00:00 2001 From: Damiano Donati Date: Sat, 18 Apr 2026 21:02:26 +0200 Subject: [PATCH 3/5] 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. --- ...riv-cluster-api-operator-release-4.13.yaml | 2 +- ...riv-cluster-api-operator-release-4.14.yaml | 2 +- ...riv-cluster-api-operator-release-4.15.yaml | 2 +- ...riv-cluster-api-operator-release-4.16.yaml | 2 +- ...riv-cluster-api-operator-release-4.17.yaml | 2 +- ...riv-cluster-api-operator-release-4.18.yaml | 2 +- ...riv-cluster-api-operator-release-4.19.yaml | 2 +- ...riv-cluster-api-operator-release-4.20.yaml | 2 +- ...iv-cluster-capi-operator-release-4.11.yaml | 4 ++-- ...ft-priv-cluster-machine-approver-main.yaml | 2 +- ...cluster-machine-approver-release-4.11.yaml | 2 +- ...cluster-machine-approver-release-4.12.yaml | 2 +- ...cluster-machine-approver-release-4.13.yaml | 2 +- ...cluster-machine-approver-release-4.14.yaml | 2 +- ...cluster-machine-approver-release-4.15.yaml | 2 +- ...cluster-machine-approver-release-4.16.yaml | 2 +- ...cluster-machine-approver-release-4.17.yaml | 2 +- ...cluster-machine-approver-release-4.18.yaml | 2 +- ...cluster-machine-approver-release-4.19.yaml | 2 +- ...cluster-machine-approver-release-4.20.yaml | 2 +- ...cluster-machine-approver-release-4.21.yaml | 2 +- ...cluster-machine-approver-release-4.22.yaml | 2 +- ...cluster-machine-approver-release-4.23.yaml | 2 +- ...-cluster-machine-approver-release-5.0.yaml | 2 +- ...-cluster-machine-approver-release-5.1.yaml | 2 +- ...ift-cluster-api-operator-release-4.13.yaml | 2 +- ...ift-cluster-api-operator-release-4.14.yaml | 2 +- ...ift-cluster-api-operator-release-4.15.yaml | 2 +- ...ift-cluster-api-operator-release-4.16.yaml | 2 +- ...ift-cluster-api-operator-release-4.17.yaml | 2 +- ...ift-cluster-api-operator-release-4.18.yaml | 2 +- ...ift-cluster-api-operator-release-4.19.yaml | 2 +- ...ift-cluster-api-operator-release-4.20.yaml | 2 +- ...ft-cluster-capi-operator-release-4.11.yaml | 4 ++-- ...enshift-cluster-machine-approver-main.yaml | 2 +- ...cluster-machine-approver-release-4.11.yaml | 2 +- ...cluster-machine-approver-release-4.12.yaml | 2 +- ...cluster-machine-approver-release-4.13.yaml | 2 +- ...cluster-machine-approver-release-4.14.yaml | 2 +- ...cluster-machine-approver-release-4.15.yaml | 2 +- ...cluster-machine-approver-release-4.16.yaml | 2 +- ...cluster-machine-approver-release-4.17.yaml | 2 +- ...cluster-machine-approver-release-4.18.yaml | 2 +- ...cluster-machine-approver-release-4.19.yaml | 2 +- ...cluster-machine-approver-release-4.20.yaml | 2 +- ...cluster-machine-approver-release-4.21.yaml | 2 +- ...cluster-machine-approver-release-4.22.yaml | 2 +- ...cluster-machine-approver-release-4.23.yaml | 2 +- ...-cluster-machine-approver-release-5.0.yaml | 2 +- ...-cluster-machine-approver-release-5.1.yaml | 2 +- .../openshift/e2e/aws/capi/OWNERS | 19 ----------------- ...nshift-e2e-aws-capi-workflow.metadata.json | 21 ------------------- .../capi/openshift-e2e-aws-capi-workflow.yaml | 17 --------------- .../e2e/aws/techpreview/post-install/OWNERS | 1 + ...review-post-install-workflow.metadata.json | 12 +++++++++++ ...aws-techpreview-post-install-workflow.yaml | 20 ++++++++++++++++++ 56 files changed, 85 insertions(+), 109 deletions(-) delete mode 100644 ci-operator/step-registry/openshift/e2e/aws/capi/OWNERS delete mode 100644 ci-operator/step-registry/openshift/e2e/aws/capi/openshift-e2e-aws-capi-workflow.metadata.json delete mode 100644 ci-operator/step-registry/openshift/e2e/aws/capi/openshift-e2e-aws-capi-workflow.yaml create mode 120000 ci-operator/step-registry/openshift/e2e/aws/techpreview/post-install/OWNERS create mode 100644 ci-operator/step-registry/openshift/e2e/aws/techpreview/post-install/openshift-e2e-aws-techpreview-post-install-workflow.metadata.json create mode 100644 ci-operator/step-registry/openshift/e2e/aws/techpreview/post-install/openshift-e2e-aws-techpreview-post-install-workflow.yaml diff --git a/ci-operator/config/openshift-priv/cluster-api-operator/openshift-priv-cluster-api-operator-release-4.13.yaml b/ci-operator/config/openshift-priv/cluster-api-operator/openshift-priv-cluster-api-operator-release-4.13.yaml index 95273fb6ac28c..64a8fd385dbea 100644 --- a/ci-operator/config/openshift-priv/cluster-api-operator/openshift-priv-cluster-api-operator-release-4.13.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-operator/openshift-priv-cluster-api-operator-release-4.13.yaml @@ -46,7 +46,7 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install - as: e2e-gcp-ovn-techpreview skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: diff --git a/ci-operator/config/openshift-priv/cluster-api-operator/openshift-priv-cluster-api-operator-release-4.14.yaml b/ci-operator/config/openshift-priv/cluster-api-operator/openshift-priv-cluster-api-operator-release-4.14.yaml index 4af0a410a5f23..f10b8c700527c 100644 --- a/ci-operator/config/openshift-priv/cluster-api-operator/openshift-priv-cluster-api-operator-release-4.14.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-operator/openshift-priv-cluster-api-operator-release-4.14.yaml @@ -46,7 +46,7 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install - as: e2e-gcp-ovn-techpreview skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: diff --git a/ci-operator/config/openshift-priv/cluster-api-operator/openshift-priv-cluster-api-operator-release-4.15.yaml b/ci-operator/config/openshift-priv/cluster-api-operator/openshift-priv-cluster-api-operator-release-4.15.yaml index 1cc32247a0331..fe40026012140 100644 --- a/ci-operator/config/openshift-priv/cluster-api-operator/openshift-priv-cluster-api-operator-release-4.15.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-operator/openshift-priv-cluster-api-operator-release-4.15.yaml @@ -45,7 +45,7 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install - as: e2e-gcp-ovn-techpreview skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: diff --git a/ci-operator/config/openshift-priv/cluster-api-operator/openshift-priv-cluster-api-operator-release-4.16.yaml b/ci-operator/config/openshift-priv/cluster-api-operator/openshift-priv-cluster-api-operator-release-4.16.yaml index 6436ea5b5f911..6094dffebd2c8 100644 --- a/ci-operator/config/openshift-priv/cluster-api-operator/openshift-priv-cluster-api-operator-release-4.16.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-operator/openshift-priv-cluster-api-operator-release-4.16.yaml @@ -42,7 +42,7 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install - as: e2e-gcp-ovn-techpreview skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: diff --git a/ci-operator/config/openshift-priv/cluster-api-operator/openshift-priv-cluster-api-operator-release-4.17.yaml b/ci-operator/config/openshift-priv/cluster-api-operator/openshift-priv-cluster-api-operator-release-4.17.yaml index 79652b4027160..0dd6537427dcd 100644 --- a/ci-operator/config/openshift-priv/cluster-api-operator/openshift-priv-cluster-api-operator-release-4.17.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-operator/openshift-priv-cluster-api-operator-release-4.17.yaml @@ -42,7 +42,7 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install - as: e2e-gcp-ovn-techpreview skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: diff --git a/ci-operator/config/openshift-priv/cluster-api-operator/openshift-priv-cluster-api-operator-release-4.18.yaml b/ci-operator/config/openshift-priv/cluster-api-operator/openshift-priv-cluster-api-operator-release-4.18.yaml index 34f9ef2a58116..56218e6a9cc5f 100644 --- a/ci-operator/config/openshift-priv/cluster-api-operator/openshift-priv-cluster-api-operator-release-4.18.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-operator/openshift-priv-cluster-api-operator-release-4.18.yaml @@ -42,7 +42,7 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install - as: e2e-gcp-ovn-techpreview skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: diff --git a/ci-operator/config/openshift-priv/cluster-api-operator/openshift-priv-cluster-api-operator-release-4.19.yaml b/ci-operator/config/openshift-priv/cluster-api-operator/openshift-priv-cluster-api-operator-release-4.19.yaml index 55de0d0f05a29..6c8b56c2f84bf 100644 --- a/ci-operator/config/openshift-priv/cluster-api-operator/openshift-priv-cluster-api-operator-release-4.19.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-operator/openshift-priv-cluster-api-operator-release-4.19.yaml @@ -42,7 +42,7 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install - as: e2e-gcp-ovn-techpreview skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: diff --git a/ci-operator/config/openshift-priv/cluster-api-operator/openshift-priv-cluster-api-operator-release-4.20.yaml b/ci-operator/config/openshift-priv/cluster-api-operator/openshift-priv-cluster-api-operator-release-4.20.yaml index 0cf9894375301..1d2dc87fc0f4b 100644 --- a/ci-operator/config/openshift-priv/cluster-api-operator/openshift-priv-cluster-api-operator-release-4.20.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-operator/openshift-priv-cluster-api-operator-release-4.20.yaml @@ -42,7 +42,7 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install - as: e2e-gcp-ovn-techpreview skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: diff --git a/ci-operator/config/openshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-release-4.11.yaml b/ci-operator/config/openshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-release-4.11.yaml index d94f777982f40..bb56361fdb646 100644 --- a/ci-operator/config/openshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-release-4.11.yaml +++ b/ci-operator/config/openshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-release-4.11.yaml @@ -61,7 +61,7 @@ tests: - as: e2e-aws-techpreview steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install - as: e2e-aws-capi-techpreview steps: cluster_profile: openshift-org-aws @@ -72,7 +72,7 @@ tests: resources: requests: cpu: 100m - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install - always_run: false as: e2e-gcp-techpreview optional: true diff --git a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-main.yaml b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-main.yaml index b035f103024a7..c237a0b68de87 100644 --- a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-main.yaml +++ b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-main.yaml @@ -96,7 +96,7 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install - as: e2e-hypershift-aws skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: diff --git a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.11.yaml b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.11.yaml index 6a58277699b19..647c10971c43d 100644 --- a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.11.yaml +++ b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.11.yaml @@ -92,7 +92,7 @@ tests: - as: e2e-aws-capi-techpreview steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install zz_generated_metadata: branch: release-4.11 org: openshift-priv diff --git a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.12.yaml b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.12.yaml index b3ad8a932b605..5ae90bf6aaca1 100644 --- a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.12.yaml +++ b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.12.yaml @@ -86,7 +86,7 @@ tests: - as: e2e-aws-capi-techpreview steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install zz_generated_metadata: branch: release-4.12 org: openshift-priv diff --git a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.13.yaml b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.13.yaml index c9649eeddaf78..7103e0ea9520b 100644 --- a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.13.yaml +++ b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.13.yaml @@ -90,7 +90,7 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install zz_generated_metadata: branch: release-4.13 org: openshift-priv diff --git a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.14.yaml b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.14.yaml index 384e50e8a62f5..31dd05e754464 100644 --- a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.14.yaml +++ b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.14.yaml @@ -90,7 +90,7 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install zz_generated_metadata: branch: release-4.14 org: openshift-priv diff --git a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.15.yaml b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.15.yaml index d09c0739c34e6..c56589a99a8bc 100644 --- a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.15.yaml +++ b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.15.yaml @@ -84,7 +84,7 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install zz_generated_metadata: branch: release-4.15 org: openshift-priv diff --git a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.16.yaml b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.16.yaml index 754d1dab20e4a..83a90e60d01ce 100644 --- a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.16.yaml +++ b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.16.yaml @@ -84,7 +84,7 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install zz_generated_metadata: branch: release-4.16 org: openshift-priv diff --git a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.17.yaml b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.17.yaml index 9f075f368d796..b14b66ebaa0fc 100644 --- a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.17.yaml +++ b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.17.yaml @@ -84,7 +84,7 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install zz_generated_metadata: branch: release-4.17 org: openshift-priv diff --git a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.18.yaml b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.18.yaml index 4cf1cfdd28e01..048efba29aaa3 100644 --- a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.18.yaml +++ b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.18.yaml @@ -84,7 +84,7 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install zz_generated_metadata: branch: release-4.18 org: openshift-priv diff --git a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.19.yaml b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.19.yaml index a524a748bebcc..dbda6c695f3a1 100644 --- a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.19.yaml +++ b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.19.yaml @@ -84,7 +84,7 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install - as: verify-deps steps: env: diff --git a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.20.yaml b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.20.yaml index f92d28dc96a52..c996bbe4e583a 100644 --- a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.20.yaml +++ b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.20.yaml @@ -84,7 +84,7 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install - as: verify-deps steps: env: diff --git a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.21.yaml b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.21.yaml index 4414cda7acfe1..06c18471ad5a3 100644 --- a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.21.yaml +++ b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.21.yaml @@ -87,7 +87,7 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install - as: verify-deps steps: env: diff --git a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.22.yaml b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.22.yaml index 87f83089e928f..7048b0e38e4d1 100644 --- a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.22.yaml +++ b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.22.yaml @@ -96,7 +96,7 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install - as: e2e-hypershift-aws skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: diff --git a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.23.yaml b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.23.yaml index c66b8cea405fb..85bccdbb6b66e 100644 --- a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.23.yaml +++ b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.23.yaml @@ -96,7 +96,7 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install - as: e2e-hypershift-aws skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: diff --git a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-5.0.yaml b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-5.0.yaml index 93a6e4dddb6cd..0736cd5ddb588 100644 --- a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-5.0.yaml +++ b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-5.0.yaml @@ -97,7 +97,7 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install - as: e2e-hypershift-aws skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: diff --git a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-5.1.yaml b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-5.1.yaml index 36230fd4bfa99..08a2ad8d7f95b 100644 --- a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-5.1.yaml +++ b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-5.1.yaml @@ -96,7 +96,7 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install - as: e2e-hypershift-aws skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: diff --git a/ci-operator/config/openshift/cluster-api-operator/openshift-cluster-api-operator-release-4.13.yaml b/ci-operator/config/openshift/cluster-api-operator/openshift-cluster-api-operator-release-4.13.yaml index 63f7697e638e0..41b81c45c1e3c 100644 --- a/ci-operator/config/openshift/cluster-api-operator/openshift-cluster-api-operator-release-4.13.yaml +++ b/ci-operator/config/openshift/cluster-api-operator/openshift-cluster-api-operator-release-4.13.yaml @@ -46,7 +46,7 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install - as: e2e-gcp-ovn-techpreview skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: diff --git a/ci-operator/config/openshift/cluster-api-operator/openshift-cluster-api-operator-release-4.14.yaml b/ci-operator/config/openshift/cluster-api-operator/openshift-cluster-api-operator-release-4.14.yaml index 4fa67979e0a34..c6f25d60019b2 100644 --- a/ci-operator/config/openshift/cluster-api-operator/openshift-cluster-api-operator-release-4.14.yaml +++ b/ci-operator/config/openshift/cluster-api-operator/openshift-cluster-api-operator-release-4.14.yaml @@ -46,7 +46,7 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install - as: e2e-gcp-ovn-techpreview skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: diff --git a/ci-operator/config/openshift/cluster-api-operator/openshift-cluster-api-operator-release-4.15.yaml b/ci-operator/config/openshift/cluster-api-operator/openshift-cluster-api-operator-release-4.15.yaml index 618e640eb002e..6ca840cadc17e 100644 --- a/ci-operator/config/openshift/cluster-api-operator/openshift-cluster-api-operator-release-4.15.yaml +++ b/ci-operator/config/openshift/cluster-api-operator/openshift-cluster-api-operator-release-4.15.yaml @@ -45,7 +45,7 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install - as: e2e-gcp-ovn-techpreview skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: diff --git a/ci-operator/config/openshift/cluster-api-operator/openshift-cluster-api-operator-release-4.16.yaml b/ci-operator/config/openshift/cluster-api-operator/openshift-cluster-api-operator-release-4.16.yaml index b001baa6169e5..9ae64c0fc03b0 100644 --- a/ci-operator/config/openshift/cluster-api-operator/openshift-cluster-api-operator-release-4.16.yaml +++ b/ci-operator/config/openshift/cluster-api-operator/openshift-cluster-api-operator-release-4.16.yaml @@ -42,7 +42,7 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install - as: e2e-gcp-ovn-techpreview skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: diff --git a/ci-operator/config/openshift/cluster-api-operator/openshift-cluster-api-operator-release-4.17.yaml b/ci-operator/config/openshift/cluster-api-operator/openshift-cluster-api-operator-release-4.17.yaml index 735caa8e7da33..95a0bae11d578 100644 --- a/ci-operator/config/openshift/cluster-api-operator/openshift-cluster-api-operator-release-4.17.yaml +++ b/ci-operator/config/openshift/cluster-api-operator/openshift-cluster-api-operator-release-4.17.yaml @@ -42,7 +42,7 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install - as: e2e-gcp-ovn-techpreview skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: diff --git a/ci-operator/config/openshift/cluster-api-operator/openshift-cluster-api-operator-release-4.18.yaml b/ci-operator/config/openshift/cluster-api-operator/openshift-cluster-api-operator-release-4.18.yaml index 6bb6ae81816c5..02c395802e272 100644 --- a/ci-operator/config/openshift/cluster-api-operator/openshift-cluster-api-operator-release-4.18.yaml +++ b/ci-operator/config/openshift/cluster-api-operator/openshift-cluster-api-operator-release-4.18.yaml @@ -42,7 +42,7 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install - as: e2e-gcp-ovn-techpreview skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: diff --git a/ci-operator/config/openshift/cluster-api-operator/openshift-cluster-api-operator-release-4.19.yaml b/ci-operator/config/openshift/cluster-api-operator/openshift-cluster-api-operator-release-4.19.yaml index ba5e7d80b96c1..3cd5d74daf1fc 100644 --- a/ci-operator/config/openshift/cluster-api-operator/openshift-cluster-api-operator-release-4.19.yaml +++ b/ci-operator/config/openshift/cluster-api-operator/openshift-cluster-api-operator-release-4.19.yaml @@ -42,7 +42,7 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install - as: e2e-gcp-ovn-techpreview skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: diff --git a/ci-operator/config/openshift/cluster-api-operator/openshift-cluster-api-operator-release-4.20.yaml b/ci-operator/config/openshift/cluster-api-operator/openshift-cluster-api-operator-release-4.20.yaml index 5a517939b01e5..aa2d9c4d268af 100644 --- a/ci-operator/config/openshift/cluster-api-operator/openshift-cluster-api-operator-release-4.20.yaml +++ b/ci-operator/config/openshift/cluster-api-operator/openshift-cluster-api-operator-release-4.20.yaml @@ -42,7 +42,7 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install - as: e2e-gcp-ovn-techpreview skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: diff --git a/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.11.yaml b/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.11.yaml index 34260cbd44a60..8f6695d4ffbed 100644 --- a/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.11.yaml +++ b/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.11.yaml @@ -60,7 +60,7 @@ tests: - as: e2e-aws-techpreview steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install - as: e2e-aws-capi-techpreview steps: cluster_profile: openshift-org-aws @@ -71,7 +71,7 @@ tests: resources: requests: cpu: 100m - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install - always_run: false as: e2e-gcp-techpreview optional: true diff --git a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-main.yaml b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-main.yaml index b50003e598fea..123180c94a409 100644 --- a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-main.yaml +++ b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-main.yaml @@ -95,7 +95,7 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install - as: e2e-hypershift-aws skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: diff --git a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.11.yaml b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.11.yaml index 5b69a22352652..8dfcfb445bcb5 100644 --- a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.11.yaml +++ b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.11.yaml @@ -91,7 +91,7 @@ tests: - as: e2e-aws-capi-techpreview steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install zz_generated_metadata: branch: release-4.11 org: openshift diff --git a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.12.yaml b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.12.yaml index 22e7e7fa36840..0edb88c25fb14 100644 --- a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.12.yaml +++ b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.12.yaml @@ -85,7 +85,7 @@ tests: - as: e2e-aws-capi-techpreview steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install zz_generated_metadata: branch: release-4.12 org: openshift diff --git a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.13.yaml b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.13.yaml index 936b175577400..5992cda0032be 100644 --- a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.13.yaml +++ b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.13.yaml @@ -89,7 +89,7 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install zz_generated_metadata: branch: release-4.13 org: openshift diff --git a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.14.yaml b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.14.yaml index 26b7e8641af05..94e6a35457717 100644 --- a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.14.yaml +++ b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.14.yaml @@ -89,7 +89,7 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install zz_generated_metadata: branch: release-4.14 org: openshift diff --git a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.15.yaml b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.15.yaml index c27a6dcf77811..9973bb3a4d1d2 100644 --- a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.15.yaml +++ b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.15.yaml @@ -83,7 +83,7 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install zz_generated_metadata: branch: release-4.15 org: openshift diff --git a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.16.yaml b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.16.yaml index 9fe452d4841de..197df74b15758 100644 --- a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.16.yaml +++ b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.16.yaml @@ -83,7 +83,7 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install zz_generated_metadata: branch: release-4.16 org: openshift diff --git a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.17.yaml b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.17.yaml index 3d76b3c2d9ada..1ae040c5ce8a2 100644 --- a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.17.yaml +++ b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.17.yaml @@ -83,7 +83,7 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install zz_generated_metadata: branch: release-4.17 org: openshift diff --git a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.18.yaml b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.18.yaml index 588aeae43660d..fc35f3b6e8eb5 100644 --- a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.18.yaml +++ b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.18.yaml @@ -83,7 +83,7 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install zz_generated_metadata: branch: release-4.18 org: openshift diff --git a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.19.yaml b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.19.yaml index 1e1fbe7222a1e..5174399bbf674 100644 --- a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.19.yaml +++ b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.19.yaml @@ -83,7 +83,7 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install - as: verify-deps steps: env: diff --git a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.20.yaml b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.20.yaml index de1b2938a1657..0423ed341c996 100644 --- a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.20.yaml +++ b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.20.yaml @@ -83,7 +83,7 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install - as: verify-deps steps: env: diff --git a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.21.yaml b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.21.yaml index b38e26dd47aa2..ee7e743532da1 100644 --- a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.21.yaml +++ b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.21.yaml @@ -86,7 +86,7 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install - as: verify-deps steps: env: diff --git a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.22.yaml b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.22.yaml index 24d474dd8efc7..95df4c23edf23 100644 --- a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.22.yaml +++ b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.22.yaml @@ -95,7 +95,7 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install - as: e2e-hypershift-aws skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: diff --git a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.23.yaml b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.23.yaml index 48a18dbf3c303..d544f0d39ad2d 100644 --- a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.23.yaml +++ b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.23.yaml @@ -95,7 +95,7 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install - as: e2e-hypershift-aws skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: diff --git a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-5.0.yaml b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-5.0.yaml index cc730e12a3ae8..835654b87f049 100644 --- a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-5.0.yaml +++ b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-5.0.yaml @@ -96,7 +96,7 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install - as: e2e-hypershift-aws skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: diff --git a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-5.1.yaml b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-5.1.yaml index 7844c8a8bb416..8d6be3a248d12 100644 --- a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-5.1.yaml +++ b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-5.1.yaml @@ -95,7 +95,7 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-capi + workflow: openshift-e2e-aws-techpreview-post-install - as: e2e-hypershift-aws skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: diff --git a/ci-operator/step-registry/openshift/e2e/aws/capi/OWNERS b/ci-operator/step-registry/openshift/e2e/aws/capi/OWNERS deleted file mode 100644 index 2b2898d8b2e07..0000000000000 --- a/ci-operator/step-registry/openshift/e2e/aws/capi/OWNERS +++ /dev/null @@ -1,19 +0,0 @@ -# DO NOT EDIT; this file is auto-generated using https://github.com/openshift/ci-tools. -# See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md - -approvers: -- alexander-demichev -- elmiko -- fedosin -- joelspeed -- lobziik -- damdo - -options: {} -reviewers: -- alexander-demichev -- elmiko -- fedosin -- joelspeed -- lobziik -- damdo diff --git a/ci-operator/step-registry/openshift/e2e/aws/capi/openshift-e2e-aws-capi-workflow.metadata.json b/ci-operator/step-registry/openshift/e2e/aws/capi/openshift-e2e-aws-capi-workflow.metadata.json deleted file mode 100644 index 15a23d0f72875..0000000000000 --- a/ci-operator/step-registry/openshift/e2e/aws/capi/openshift-e2e-aws-capi-workflow.metadata.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "path": "openshift/e2e/aws/capi/openshift-e2e-aws-capi-workflow.yaml", - "owners": { - "approvers": [ - "alexander-demichev", - "elmiko", - "fedosin", - "joelspeed", - "lobziik", - "damdo" - ], - "reviewers": [ - "alexander-demichev", - "elmiko", - "fedosin", - "joelspeed", - "lobziik", - "damdo" - ] - } -} \ No newline at end of file diff --git a/ci-operator/step-registry/openshift/e2e/aws/capi/openshift-e2e-aws-capi-workflow.yaml b/ci-operator/step-registry/openshift/e2e/aws/capi/openshift-e2e-aws-capi-workflow.yaml deleted file mode 100644 index f935b375a05da..0000000000000 --- a/ci-operator/step-registry/openshift/e2e/aws/capi/openshift-e2e-aws-capi-workflow.yaml +++ /dev/null @@ -1,17 +0,0 @@ -workflow: - as: openshift-e2e-aws-capi - steps: - pre: - - ref: ipi-conf - - ref: ipi-conf-telemetry - - ref: ipi-conf-aws - - chain: ipi-install - - ref: ipi-install-post-featureset - - ref: openshift-oc-wait-for-stable-cluster - test: - - ref: openshift-e2e-test - post: - - chain: gather-core-dump - - chain: ipi-aws-post - documentation: |- - The Openshift E2E AWS workflow for test Cluster API integration. diff --git a/ci-operator/step-registry/openshift/e2e/aws/techpreview/post-install/OWNERS b/ci-operator/step-registry/openshift/e2e/aws/techpreview/post-install/OWNERS new file mode 120000 index 0000000000000..ec405d65a79df --- /dev/null +++ b/ci-operator/step-registry/openshift/e2e/aws/techpreview/post-install/OWNERS @@ -0,0 +1 @@ +../OWNERS \ No newline at end of file diff --git a/ci-operator/step-registry/openshift/e2e/aws/techpreview/post-install/openshift-e2e-aws-techpreview-post-install-workflow.metadata.json b/ci-operator/step-registry/openshift/e2e/aws/techpreview/post-install/openshift-e2e-aws-techpreview-post-install-workflow.metadata.json new file mode 100644 index 0000000000000..0190206a1d19d --- /dev/null +++ b/ci-operator/step-registry/openshift/e2e/aws/techpreview/post-install/openshift-e2e-aws-techpreview-post-install-workflow.metadata.json @@ -0,0 +1,12 @@ +{ + "path": "openshift/e2e/aws/techpreview/post-install/openshift-e2e-aws-techpreview-post-install-workflow.yaml", + "owners": { + "approvers": [ + "deads2k", + "dgoodwin", + "stbenjam", + "vrutkovs", + "wking" + ] + } +} \ No newline at end of file diff --git a/ci-operator/step-registry/openshift/e2e/aws/techpreview/post-install/openshift-e2e-aws-techpreview-post-install-workflow.yaml b/ci-operator/step-registry/openshift/e2e/aws/techpreview/post-install/openshift-e2e-aws-techpreview-post-install-workflow.yaml new file mode 100644 index 0000000000000..f859b960e17b3 --- /dev/null +++ b/ci-operator/step-registry/openshift/e2e/aws/techpreview/post-install/openshift-e2e-aws-techpreview-post-install-workflow.yaml @@ -0,0 +1,20 @@ +workflow: + as: openshift-e2e-aws-techpreview-post-install + steps: + pre: + - ref: ipi-conf + - ref: ipi-conf-telemetry + - ref: ipi-conf-aws + - chain: ipi-install + - ref: ipi-install-post-featureset + - ref: openshift-oc-wait-for-stable-cluster + test: + - ref: openshift-e2e-test + post: + - chain: gather-core-dump + - chain: ipi-aws-post + documentation: |- + The Openshift E2E AWS workflow executes the common end-to-end test suite + on AWS after enabling TechPreviewNoUpgrade post-install. The cluster is + installed with default settings, then the FeatureGate is patched and the + workflow waits for the cluster to stabilize before running tests. From 44f45e81320f6212ac964d271fc41fb039727090 Mon Sep 17 00:00:00 2001 From: Damiano Donati Date: Sat, 18 Apr 2026 21:13:52 +0200 Subject: [PATCH 4/5] 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. --- ...ft-priv-cluster-machine-approver-main.yaml | 2 +- ...cluster-machine-approver-release-4.11.yaml | 2 +- ...cluster-machine-approver-release-4.12.yaml | 2 +- ...cluster-machine-approver-release-4.13.yaml | 2 +- ...cluster-machine-approver-release-4.14.yaml | 2 +- ...cluster-machine-approver-release-4.15.yaml | 2 +- ...cluster-machine-approver-release-4.16.yaml | 2 +- ...cluster-machine-approver-release-4.17.yaml | 2 +- ...cluster-machine-approver-release-4.18.yaml | 2 +- ...cluster-machine-approver-release-4.19.yaml | 2 +- ...cluster-machine-approver-release-4.20.yaml | 2 +- ...cluster-machine-approver-release-4.21.yaml | 2 +- ...cluster-machine-approver-release-4.22.yaml | 2 +- ...cluster-machine-approver-release-4.23.yaml | 2 +- ...-cluster-machine-approver-release-5.0.yaml | 2 +- ...-cluster-machine-approver-release-5.1.yaml | 2 +- ...enshift-cluster-machine-approver-main.yaml | 2 +- ...cluster-machine-approver-release-4.11.yaml | 2 +- ...cluster-machine-approver-release-4.12.yaml | 2 +- ...cluster-machine-approver-release-4.13.yaml | 2 +- ...cluster-machine-approver-release-4.14.yaml | 2 +- ...cluster-machine-approver-release-4.15.yaml | 2 +- ...cluster-machine-approver-release-4.16.yaml | 2 +- ...cluster-machine-approver-release-4.17.yaml | 2 +- ...cluster-machine-approver-release-4.18.yaml | 2 +- ...cluster-machine-approver-release-4.19.yaml | 2 +- ...cluster-machine-approver-release-4.20.yaml | 2 +- ...cluster-machine-approver-release-4.21.yaml | 2 +- ...cluster-machine-approver-release-4.22.yaml | 2 +- ...cluster-machine-approver-release-4.23.yaml | 2 +- ...-cluster-machine-approver-release-5.0.yaml | 2 +- ...-cluster-machine-approver-release-5.1.yaml | 2 +- ...ster-machine-approver-main-presubmits.yaml | 24 +++++----- ...hine-approver-release-4.11-presubmits.yaml | 36 +++++++-------- ...hine-approver-release-4.12-presubmits.yaml | 20 ++++----- ...hine-approver-release-4.13-presubmits.yaml | 30 ++++++------- ...hine-approver-release-4.14-presubmits.yaml | 30 ++++++------- ...hine-approver-release-4.15-presubmits.yaml | 30 ++++++------- ...hine-approver-release-4.16-presubmits.yaml | 30 ++++++------- ...hine-approver-release-4.17-presubmits.yaml | 30 ++++++------- ...hine-approver-release-4.18-presubmits.yaml | 30 ++++++------- ...hine-approver-release-4.19-presubmits.yaml | 24 +++++----- ...hine-approver-release-4.20-presubmits.yaml | 32 +++++++------- ...hine-approver-release-4.21-presubmits.yaml | 24 +++++----- ...hine-approver-release-4.22-presubmits.yaml | 24 +++++----- ...hine-approver-release-4.23-presubmits.yaml | 24 +++++----- ...chine-approver-release-5.0-presubmits.yaml | 24 +++++----- ...chine-approver-release-5.1-presubmits.yaml | 32 +++++++------- ...ster-machine-approver-main-presubmits.yaml | 38 ++++++++-------- ...hine-approver-release-4.11-presubmits.yaml | 36 +++++++-------- ...hine-approver-release-4.12-presubmits.yaml | 20 ++++----- ...hine-approver-release-4.13-presubmits.yaml | 24 +++++----- ...hine-approver-release-4.14-presubmits.yaml | 24 +++++----- ...hine-approver-release-4.15-presubmits.yaml | 24 +++++----- ...hine-approver-release-4.16-presubmits.yaml | 24 +++++----- ...hine-approver-release-4.17-presubmits.yaml | 24 +++++----- ...hine-approver-release-4.18-presubmits.yaml | 24 +++++----- ...hine-approver-release-4.19-presubmits.yaml | 24 +++++----- ...hine-approver-release-4.20-presubmits.yaml | 24 +++++----- ...hine-approver-release-4.21-presubmits.yaml | 24 +++++----- ...hine-approver-release-4.22-presubmits.yaml | 24 +++++----- ...hine-approver-release-4.23-presubmits.yaml | 36 +++++++-------- ...chine-approver-release-5.0-presubmits.yaml | 24 +++++----- ...chine-approver-release-5.1-presubmits.yaml | 44 +++++++++---------- 64 files changed, 473 insertions(+), 473 deletions(-) diff --git a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-main.yaml b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-main.yaml index c237a0b68de87..6a8406aaef385 100644 --- a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-main.yaml +++ b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-main.yaml @@ -92,7 +92,7 @@ tests: steps: cluster_profile: openshift-org-aws workflow: openshift-upgrade-aws -- as: e2e-aws-capi-techpreview +- as: e2e-aws-techpreview-post-install skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws diff --git a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.11.yaml b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.11.yaml index 647c10971c43d..c140828268519 100644 --- a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.11.yaml +++ b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.11.yaml @@ -89,7 +89,7 @@ tests: steps: cluster_profile: openshift-org-aws workflow: openshift-e2e-aws-disruption -- as: e2e-aws-capi-techpreview +- as: e2e-aws-techpreview-post-install steps: cluster_profile: openshift-org-aws workflow: openshift-e2e-aws-techpreview-post-install diff --git a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.12.yaml b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.12.yaml index 5ae90bf6aaca1..75008d0c4d427 100644 --- a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.12.yaml +++ b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.12.yaml @@ -83,7 +83,7 @@ tests: steps: cluster_profile: openshift-org-aws workflow: openshift-upgrade-aws -- as: e2e-aws-capi-techpreview +- as: e2e-aws-techpreview-post-install steps: cluster_profile: openshift-org-aws workflow: openshift-e2e-aws-techpreview-post-install diff --git a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.13.yaml b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.13.yaml index 7103e0ea9520b..4f3b8c21ba166 100644 --- a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.13.yaml +++ b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.13.yaml @@ -86,7 +86,7 @@ tests: steps: cluster_profile: openshift-org-aws workflow: openshift-upgrade-aws -- as: e2e-aws-capi-techpreview +- as: e2e-aws-techpreview-post-install skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws diff --git a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.14.yaml b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.14.yaml index 31dd05e754464..5ebfd09cdc47e 100644 --- a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.14.yaml +++ b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.14.yaml @@ -86,7 +86,7 @@ tests: steps: cluster_profile: openshift-org-aws workflow: openshift-upgrade-aws -- as: e2e-aws-capi-techpreview +- as: e2e-aws-techpreview-post-install skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws diff --git a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.15.yaml b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.15.yaml index c56589a99a8bc..885301054eb20 100644 --- a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.15.yaml +++ b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.15.yaml @@ -80,7 +80,7 @@ tests: steps: cluster_profile: openshift-org-aws workflow: openshift-upgrade-aws -- as: e2e-aws-capi-techpreview +- as: e2e-aws-techpreview-post-install skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws diff --git a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.16.yaml b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.16.yaml index 83a90e60d01ce..49b0890cea377 100644 --- a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.16.yaml +++ b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.16.yaml @@ -80,7 +80,7 @@ tests: steps: cluster_profile: openshift-org-aws workflow: openshift-upgrade-aws -- as: e2e-aws-capi-techpreview +- as: e2e-aws-techpreview-post-install skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws diff --git a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.17.yaml b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.17.yaml index b14b66ebaa0fc..b4c4ecc7d1b2a 100644 --- a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.17.yaml +++ b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.17.yaml @@ -80,7 +80,7 @@ tests: steps: cluster_profile: openshift-org-aws workflow: openshift-upgrade-aws -- as: e2e-aws-capi-techpreview +- as: e2e-aws-techpreview-post-install skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws diff --git a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.18.yaml b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.18.yaml index 048efba29aaa3..7eca15af03b33 100644 --- a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.18.yaml +++ b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.18.yaml @@ -80,7 +80,7 @@ tests: steps: cluster_profile: openshift-org-aws workflow: openshift-upgrade-aws -- as: e2e-aws-capi-techpreview +- as: e2e-aws-techpreview-post-install skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws diff --git a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.19.yaml b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.19.yaml index dbda6c695f3a1..7e1b2e00e0615 100644 --- a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.19.yaml +++ b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.19.yaml @@ -80,7 +80,7 @@ tests: steps: cluster_profile: openshift-org-aws workflow: openshift-upgrade-aws -- as: e2e-aws-capi-techpreview +- as: e2e-aws-techpreview-post-install skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws diff --git a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.20.yaml b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.20.yaml index c996bbe4e583a..08beee0f75498 100644 --- a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.20.yaml +++ b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.20.yaml @@ -80,7 +80,7 @@ tests: steps: cluster_profile: openshift-org-aws workflow: openshift-upgrade-aws -- as: e2e-aws-capi-techpreview +- as: e2e-aws-techpreview-post-install skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws diff --git a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.21.yaml b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.21.yaml index 06c18471ad5a3..0b2a7e33d5fd2 100644 --- a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.21.yaml +++ b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.21.yaml @@ -83,7 +83,7 @@ tests: steps: cluster_profile: openshift-org-aws workflow: openshift-upgrade-aws -- as: e2e-aws-capi-techpreview +- as: e2e-aws-techpreview-post-install skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws diff --git a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.22.yaml b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.22.yaml index 7048b0e38e4d1..f11583698fb42 100644 --- a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.22.yaml +++ b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.22.yaml @@ -92,7 +92,7 @@ tests: steps: cluster_profile: openshift-org-aws workflow: openshift-upgrade-aws -- as: e2e-aws-capi-techpreview +- as: e2e-aws-techpreview-post-install skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws diff --git a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.23.yaml b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.23.yaml index 85bccdbb6b66e..5190b743cc10e 100644 --- a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.23.yaml +++ b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.23.yaml @@ -92,7 +92,7 @@ tests: steps: cluster_profile: openshift-org-aws workflow: openshift-upgrade-aws -- as: e2e-aws-capi-techpreview +- as: e2e-aws-techpreview-post-install skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws diff --git a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-5.0.yaml b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-5.0.yaml index 0736cd5ddb588..fffe81dcd520b 100644 --- a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-5.0.yaml +++ b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-5.0.yaml @@ -93,7 +93,7 @@ tests: steps: cluster_profile: openshift-org-aws workflow: openshift-upgrade-aws -- as: e2e-aws-capi-techpreview +- as: e2e-aws-techpreview-post-install skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws diff --git a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-5.1.yaml b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-5.1.yaml index 08a2ad8d7f95b..ab7e6fd2f14ff 100644 --- a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-5.1.yaml +++ b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-5.1.yaml @@ -92,7 +92,7 @@ tests: steps: cluster_profile: openshift-org-aws workflow: openshift-upgrade-aws -- as: e2e-aws-capi-techpreview +- as: e2e-aws-techpreview-post-install skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws diff --git a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-main.yaml b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-main.yaml index 123180c94a409..ce9909f81edf9 100644 --- a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-main.yaml +++ b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-main.yaml @@ -91,7 +91,7 @@ tests: steps: cluster_profile: openshift-org-aws workflow: openshift-upgrade-aws -- as: e2e-aws-capi-techpreview +- as: e2e-aws-techpreview-post-install skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws diff --git a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.11.yaml b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.11.yaml index 8dfcfb445bcb5..0d995ff2f110f 100644 --- a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.11.yaml +++ b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.11.yaml @@ -88,7 +88,7 @@ tests: steps: cluster_profile: openshift-org-aws workflow: openshift-e2e-aws-disruption -- as: e2e-aws-capi-techpreview +- as: e2e-aws-techpreview-post-install steps: cluster_profile: openshift-org-aws workflow: openshift-e2e-aws-techpreview-post-install diff --git a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.12.yaml b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.12.yaml index 0edb88c25fb14..4b978c2d75304 100644 --- a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.12.yaml +++ b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.12.yaml @@ -82,7 +82,7 @@ tests: steps: cluster_profile: openshift-org-aws workflow: openshift-upgrade-aws -- as: e2e-aws-capi-techpreview +- as: e2e-aws-techpreview-post-install steps: cluster_profile: openshift-org-aws workflow: openshift-e2e-aws-techpreview-post-install diff --git a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.13.yaml b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.13.yaml index 5992cda0032be..7a06d5bf7019c 100644 --- a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.13.yaml +++ b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.13.yaml @@ -85,7 +85,7 @@ tests: steps: cluster_profile: openshift-org-aws workflow: openshift-upgrade-aws -- as: e2e-aws-capi-techpreview +- as: e2e-aws-techpreview-post-install skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws diff --git a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.14.yaml b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.14.yaml index 94e6a35457717..0d459d86cc6ad 100644 --- a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.14.yaml +++ b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.14.yaml @@ -85,7 +85,7 @@ tests: steps: cluster_profile: openshift-org-aws workflow: openshift-upgrade-aws -- as: e2e-aws-capi-techpreview +- as: e2e-aws-techpreview-post-install skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws diff --git a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.15.yaml b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.15.yaml index 9973bb3a4d1d2..e75fe2c1d3647 100644 --- a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.15.yaml +++ b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.15.yaml @@ -79,7 +79,7 @@ tests: steps: cluster_profile: openshift-org-aws workflow: openshift-upgrade-aws -- as: e2e-aws-capi-techpreview +- as: e2e-aws-techpreview-post-install skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws diff --git a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.16.yaml b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.16.yaml index 197df74b15758..465e175884225 100644 --- a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.16.yaml +++ b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.16.yaml @@ -79,7 +79,7 @@ tests: steps: cluster_profile: openshift-org-aws workflow: openshift-upgrade-aws -- as: e2e-aws-capi-techpreview +- as: e2e-aws-techpreview-post-install skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws diff --git a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.17.yaml b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.17.yaml index 1ae040c5ce8a2..a70763dffa99c 100644 --- a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.17.yaml +++ b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.17.yaml @@ -79,7 +79,7 @@ tests: steps: cluster_profile: openshift-org-aws workflow: openshift-upgrade-aws -- as: e2e-aws-capi-techpreview +- as: e2e-aws-techpreview-post-install skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws diff --git a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.18.yaml b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.18.yaml index fc35f3b6e8eb5..d3a406b804f11 100644 --- a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.18.yaml +++ b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.18.yaml @@ -79,7 +79,7 @@ tests: steps: cluster_profile: openshift-org-aws workflow: openshift-upgrade-aws -- as: e2e-aws-capi-techpreview +- as: e2e-aws-techpreview-post-install skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws diff --git a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.19.yaml b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.19.yaml index 5174399bbf674..e1572baa47b5a 100644 --- a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.19.yaml +++ b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.19.yaml @@ -79,7 +79,7 @@ tests: steps: cluster_profile: openshift-org-aws workflow: openshift-upgrade-aws -- as: e2e-aws-capi-techpreview +- as: e2e-aws-techpreview-post-install skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws diff --git a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.20.yaml b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.20.yaml index 0423ed341c996..4c9ec4528696a 100644 --- a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.20.yaml +++ b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.20.yaml @@ -79,7 +79,7 @@ tests: steps: cluster_profile: openshift-org-aws workflow: openshift-upgrade-aws -- as: e2e-aws-capi-techpreview +- as: e2e-aws-techpreview-post-install skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws diff --git a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.21.yaml b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.21.yaml index ee7e743532da1..8fa8fd2cf48a3 100644 --- a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.21.yaml +++ b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.21.yaml @@ -82,7 +82,7 @@ tests: steps: cluster_profile: openshift-org-aws workflow: openshift-upgrade-aws -- as: e2e-aws-capi-techpreview +- as: e2e-aws-techpreview-post-install skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws diff --git a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.22.yaml b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.22.yaml index 95df4c23edf23..a9a81173ad646 100644 --- a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.22.yaml +++ b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.22.yaml @@ -91,7 +91,7 @@ tests: steps: cluster_profile: openshift-org-aws workflow: openshift-upgrade-aws -- as: e2e-aws-capi-techpreview +- as: e2e-aws-techpreview-post-install skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws diff --git a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.23.yaml b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.23.yaml index d544f0d39ad2d..aab54caa6c58d 100644 --- a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.23.yaml +++ b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.23.yaml @@ -91,7 +91,7 @@ tests: steps: cluster_profile: openshift-org-aws workflow: openshift-upgrade-aws -- as: e2e-aws-capi-techpreview +- as: e2e-aws-techpreview-post-install skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws diff --git a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-5.0.yaml b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-5.0.yaml index 835654b87f049..1e12cfa342329 100644 --- a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-5.0.yaml +++ b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-5.0.yaml @@ -92,7 +92,7 @@ tests: steps: cluster_profile: openshift-org-aws workflow: openshift-upgrade-aws -- as: e2e-aws-capi-techpreview +- as: e2e-aws-techpreview-post-install skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws diff --git a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-5.1.yaml b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-5.1.yaml index 8d6be3a248d12..f9ae6a99d667e 100644 --- a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-5.1.yaml +++ b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-5.1.yaml @@ -91,7 +91,7 @@ tests: steps: cluster_profile: openshift-org-aws workflow: openshift-upgrade-aws -- as: e2e-aws-capi-techpreview +- as: e2e-aws-techpreview-post-install skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws diff --git a/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-main-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-main-presubmits.yaml index 1f96f66600ae8..13cdbf703fe5c 100644 --- a/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-main-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-main-presubmits.yaml @@ -97,7 +97,7 @@ presubmits: - ^main$ - ^main- cluster: build07 - context: ci/prow/e2e-aws-capi-techpreview + context: ci/prow/e2e-aws-operator decorate: true decoration_config: oauth_token_secret: @@ -109,10 +109,10 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-machine-approver-main-e2e-aws-capi-techpreview + name: pull-ci-openshift-priv-cluster-machine-approver-main-e2e-aws-operator path_alias: github.com/openshift/cluster-machine-approver - rerun_command: /test e2e-aws-capi-techpreview - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ + rerun_command: /test e2e-aws-operator + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ spec: containers: - args: @@ -122,7 +122,7 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-capi-techpreview + - --target=e2e-aws-operator command: - ci-operator env: @@ -181,14 +181,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build07 - context: ci/prow/e2e-aws-operator + context: ci/prow/e2e-aws-techpreview-post-install decorate: true decoration_config: oauth_token_secret: @@ -200,10 +200,10 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-machine-approver-main-e2e-aws-operator + name: pull-ci-openshift-priv-cluster-machine-approver-main-e2e-aws-techpreview-post-install path_alias: github.com/openshift/cluster-machine-approver - rerun_command: /test e2e-aws-operator - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ + rerun_command: /test e2e-aws-techpreview-post-install + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ spec: containers: - args: @@ -213,7 +213,7 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-operator + - --target=e2e-aws-techpreview-post-install command: - ci-operator env: @@ -272,7 +272,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-techpreview-post-install,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.11-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.11-presubmits.yaml index 02176dc6d2466..135eabcbffa56 100644 --- a/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.11-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.11-presubmits.yaml @@ -91,12 +91,12 @@ presubmits: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*) - agent: kubernetes - always_run: true + always_run: false branches: - ^release-4\.11$ - ^release-4\.11- cluster: build07 - context: ci/prow/e2e-aws-capi-techpreview + context: ci/prow/e2e-aws-disruptive decorate: true decoration_config: oauth_token_secret: @@ -108,9 +108,10 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-machine-approver-release-4.11-e2e-aws-capi-techpreview + name: pull-ci-openshift-priv-cluster-machine-approver-release-4.11-e2e-aws-disruptive + optional: true path_alias: github.com/openshift/cluster-machine-approver - rerun_command: /test e2e-aws-capi-techpreview + rerun_command: /test e2e-aws-disruptive spec: containers: - args: @@ -120,7 +121,7 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-capi-techpreview + - --target=e2e-aws-disruptive command: - ci-operator env: @@ -179,14 +180,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*) - agent: kubernetes - always_run: false + always_run: true branches: - ^release-4\.11$ - ^release-4\.11- cluster: build07 - context: ci/prow/e2e-aws-disruptive + context: ci/prow/e2e-aws-operator decorate: true decoration_config: oauth_token_secret: @@ -198,10 +199,9 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-machine-approver-release-4.11-e2e-aws-disruptive - optional: true + name: pull-ci-openshift-priv-cluster-machine-approver-release-4.11-e2e-aws-operator path_alias: github.com/openshift/cluster-machine-approver - rerun_command: /test e2e-aws-disruptive + rerun_command: /test e2e-aws-operator spec: containers: - args: @@ -211,7 +211,7 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-disruptive + - --target=e2e-aws-operator command: - ci-operator env: @@ -270,14 +270,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) - agent: kubernetes always_run: true branches: - ^release-4\.11$ - ^release-4\.11- cluster: build07 - context: ci/prow/e2e-aws-operator + context: ci/prow/e2e-aws-techpreview-post-install decorate: true decoration_config: oauth_token_secret: @@ -289,9 +289,9 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-machine-approver-release-4.11-e2e-aws-operator + name: pull-ci-openshift-priv-cluster-machine-approver-release-4.11-e2e-aws-techpreview-post-install path_alias: github.com/openshift/cluster-machine-approver - rerun_command: /test e2e-aws-operator + rerun_command: /test e2e-aws-techpreview-post-install spec: containers: - args: @@ -301,7 +301,7 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-operator + - --target=e2e-aws-techpreview-post-install command: - ci-operator env: @@ -360,7 +360,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-techpreview-post-install,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.12-presubmits.yaml index 6d039ab82ed1c..55972fd34aaeb 100644 --- a/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.12-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.12-presubmits.yaml @@ -96,7 +96,7 @@ presubmits: - ^release-4\.12$ - ^release-4\.12- cluster: build07 - context: ci/prow/e2e-aws-capi-techpreview + context: ci/prow/e2e-aws-operator decorate: true decoration_config: oauth_token_secret: @@ -108,9 +108,9 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-machine-approver-release-4.12-e2e-aws-capi-techpreview + name: pull-ci-openshift-priv-cluster-machine-approver-release-4.12-e2e-aws-operator path_alias: github.com/openshift/cluster-machine-approver - rerun_command: /test e2e-aws-capi-techpreview + rerun_command: /test e2e-aws-operator spec: containers: - args: @@ -120,7 +120,7 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-capi-techpreview + - --target=e2e-aws-operator command: - ci-operator env: @@ -179,14 +179,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) - agent: kubernetes always_run: true branches: - ^release-4\.12$ - ^release-4\.12- cluster: build07 - context: ci/prow/e2e-aws-operator + context: ci/prow/e2e-aws-techpreview-post-install decorate: true decoration_config: oauth_token_secret: @@ -198,9 +198,9 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-machine-approver-release-4.12-e2e-aws-operator + name: pull-ci-openshift-priv-cluster-machine-approver-release-4.12-e2e-aws-techpreview-post-install path_alias: github.com/openshift/cluster-machine-approver - rerun_command: /test e2e-aws-operator + rerun_command: /test e2e-aws-techpreview-post-install spec: containers: - args: @@ -210,7 +210,7 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-operator + - --target=e2e-aws-techpreview-post-install command: - ci-operator env: @@ -269,7 +269,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-techpreview-post-install,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.13-presubmits.yaml index 042b5672e49ed..90adfefcae1d6 100644 --- a/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.13-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.13-presubmits.yaml @@ -97,7 +97,7 @@ presubmits: - ^release-4\.13$ - ^release-4\.13- cluster: build07 - context: ci/prow/e2e-aws-capi-techpreview + context: ci/prow/e2e-aws-operator decorate: true decoration_config: oauth_token_secret: @@ -109,10 +109,10 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-machine-approver-release-4.13-e2e-aws-capi-techpreview + name: pull-ci-openshift-priv-cluster-machine-approver-release-4.13-e2e-aws-operator path_alias: github.com/openshift/cluster-machine-approver - rerun_command: /test e2e-aws-capi-techpreview - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ + rerun_command: /test e2e-aws-operator + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ spec: containers: - args: @@ -122,7 +122,7 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-capi-techpreview + - --target=e2e-aws-operator command: - ci-operator env: @@ -181,14 +181,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.13$ - ^release-4\.13- cluster: build07 - context: ci/prow/e2e-aws-operator + context: ci/prow/e2e-aws-techpreview-post-install decorate: true decoration_config: oauth_token_secret: @@ -200,10 +200,10 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-machine-approver-release-4.13-e2e-aws-operator + name: pull-ci-openshift-priv-cluster-machine-approver-release-4.13-e2e-aws-techpreview-post-install path_alias: github.com/openshift/cluster-machine-approver - rerun_command: /test e2e-aws-operator - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ + rerun_command: /test e2e-aws-techpreview-post-install + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ spec: containers: - args: @@ -213,7 +213,7 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-operator + - --target=e2e-aws-techpreview-post-install command: - ci-operator env: @@ -272,13 +272,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-techpreview-post-install,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.13$ - ^release-4\.13- - cluster: build04 + cluster: build06 context: ci/prow/e2e-azure-operator decorate: true decoration_config: @@ -551,7 +551,7 @@ presubmits: branches: - ^release-4\.13$ - ^release-4\.13- - cluster: build04 + cluster: build06 context: ci/prow/images decorate: true decoration_config: @@ -614,7 +614,7 @@ presubmits: branches: - ^release-4\.13$ - ^release-4\.13- - cluster: build04 + cluster: build06 context: ci/prow/unit decorate: true decoration_config: diff --git a/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.14-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.14-presubmits.yaml index b83e9a6ff1f5c..fcf59b9a3c4c5 100644 --- a/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.14-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.14-presubmits.yaml @@ -97,7 +97,7 @@ presubmits: - ^release-4\.14$ - ^release-4\.14- cluster: build07 - context: ci/prow/e2e-aws-capi-techpreview + context: ci/prow/e2e-aws-operator decorate: true decoration_config: oauth_token_secret: @@ -109,10 +109,10 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-machine-approver-release-4.14-e2e-aws-capi-techpreview + name: pull-ci-openshift-priv-cluster-machine-approver-release-4.14-e2e-aws-operator path_alias: github.com/openshift/cluster-machine-approver - rerun_command: /test e2e-aws-capi-techpreview - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ + rerun_command: /test e2e-aws-operator + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ spec: containers: - args: @@ -122,7 +122,7 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-capi-techpreview + - --target=e2e-aws-operator command: - ci-operator env: @@ -181,14 +181,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.14$ - ^release-4\.14- cluster: build07 - context: ci/prow/e2e-aws-operator + context: ci/prow/e2e-aws-techpreview-post-install decorate: true decoration_config: oauth_token_secret: @@ -200,10 +200,10 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-machine-approver-release-4.14-e2e-aws-operator + name: pull-ci-openshift-priv-cluster-machine-approver-release-4.14-e2e-aws-techpreview-post-install path_alias: github.com/openshift/cluster-machine-approver - rerun_command: /test e2e-aws-operator - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ + rerun_command: /test e2e-aws-techpreview-post-install + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ spec: containers: - args: @@ -213,7 +213,7 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-operator + - --target=e2e-aws-techpreview-post-install command: - ci-operator env: @@ -272,13 +272,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-techpreview-post-install,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.14$ - ^release-4\.14- - cluster: build04 + cluster: build06 context: ci/prow/e2e-azure-operator decorate: true decoration_config: @@ -551,7 +551,7 @@ presubmits: branches: - ^release-4\.14$ - ^release-4\.14- - cluster: build04 + cluster: build06 context: ci/prow/images decorate: true decoration_config: @@ -614,7 +614,7 @@ presubmits: branches: - ^release-4\.14$ - ^release-4\.14- - cluster: build04 + cluster: build06 context: ci/prow/unit decorate: true decoration_config: diff --git a/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.15-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.15-presubmits.yaml index 7abf207bff012..5a2fe2d7c2776 100644 --- a/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.15-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.15-presubmits.yaml @@ -97,7 +97,7 @@ presubmits: - ^release-4\.15$ - ^release-4\.15- cluster: build07 - context: ci/prow/e2e-aws-capi-techpreview + context: ci/prow/e2e-aws-operator decorate: true decoration_config: oauth_token_secret: @@ -109,10 +109,10 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-machine-approver-release-4.15-e2e-aws-capi-techpreview + name: pull-ci-openshift-priv-cluster-machine-approver-release-4.15-e2e-aws-operator path_alias: github.com/openshift/cluster-machine-approver - rerun_command: /test e2e-aws-capi-techpreview - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ + rerun_command: /test e2e-aws-operator + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ spec: containers: - args: @@ -122,7 +122,7 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-capi-techpreview + - --target=e2e-aws-operator command: - ci-operator env: @@ -181,14 +181,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.15$ - ^release-4\.15- cluster: build07 - context: ci/prow/e2e-aws-operator + context: ci/prow/e2e-aws-techpreview-post-install decorate: true decoration_config: oauth_token_secret: @@ -200,10 +200,10 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-machine-approver-release-4.15-e2e-aws-operator + name: pull-ci-openshift-priv-cluster-machine-approver-release-4.15-e2e-aws-techpreview-post-install path_alias: github.com/openshift/cluster-machine-approver - rerun_command: /test e2e-aws-operator - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ + rerun_command: /test e2e-aws-techpreview-post-install + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ spec: containers: - args: @@ -213,7 +213,7 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-operator + - --target=e2e-aws-techpreview-post-install command: - ci-operator env: @@ -272,13 +272,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-techpreview-post-install,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.15$ - ^release-4\.15- - cluster: build04 + cluster: build06 context: ci/prow/e2e-azure-operator decorate: true decoration_config: @@ -551,7 +551,7 @@ presubmits: branches: - ^release-4\.15$ - ^release-4\.15- - cluster: build04 + cluster: build06 context: ci/prow/images decorate: true decoration_config: @@ -614,7 +614,7 @@ presubmits: branches: - ^release-4\.15$ - ^release-4\.15- - cluster: build04 + cluster: build06 context: ci/prow/unit decorate: true decoration_config: diff --git a/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.16-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.16-presubmits.yaml index 0b2d1f45b4fa8..36f424b35602c 100644 --- a/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.16-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.16-presubmits.yaml @@ -97,7 +97,7 @@ presubmits: - ^release-4\.16$ - ^release-4\.16- cluster: build07 - context: ci/prow/e2e-aws-capi-techpreview + context: ci/prow/e2e-aws-operator decorate: true decoration_config: oauth_token_secret: @@ -109,10 +109,10 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-machine-approver-release-4.16-e2e-aws-capi-techpreview + name: pull-ci-openshift-priv-cluster-machine-approver-release-4.16-e2e-aws-operator path_alias: github.com/openshift/cluster-machine-approver - rerun_command: /test e2e-aws-capi-techpreview - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ + rerun_command: /test e2e-aws-operator + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ spec: containers: - args: @@ -122,7 +122,7 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-capi-techpreview + - --target=e2e-aws-operator command: - ci-operator env: @@ -181,14 +181,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.16$ - ^release-4\.16- cluster: build07 - context: ci/prow/e2e-aws-operator + context: ci/prow/e2e-aws-techpreview-post-install decorate: true decoration_config: oauth_token_secret: @@ -200,10 +200,10 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-machine-approver-release-4.16-e2e-aws-operator + name: pull-ci-openshift-priv-cluster-machine-approver-release-4.16-e2e-aws-techpreview-post-install path_alias: github.com/openshift/cluster-machine-approver - rerun_command: /test e2e-aws-operator - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ + rerun_command: /test e2e-aws-techpreview-post-install + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ spec: containers: - args: @@ -213,7 +213,7 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-operator + - --target=e2e-aws-techpreview-post-install command: - ci-operator env: @@ -272,13 +272,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-techpreview-post-install,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.16$ - ^release-4\.16- - cluster: build04 + cluster: build06 context: ci/prow/e2e-azure-operator decorate: true decoration_config: @@ -551,7 +551,7 @@ presubmits: branches: - ^release-4\.16$ - ^release-4\.16- - cluster: build04 + cluster: build06 context: ci/prow/images decorate: true decoration_config: @@ -614,7 +614,7 @@ presubmits: branches: - ^release-4\.16$ - ^release-4\.16- - cluster: build04 + cluster: build06 context: ci/prow/unit decorate: true decoration_config: diff --git a/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.17-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.17-presubmits.yaml index 120dde9bb9a5f..201fcc2783068 100644 --- a/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.17-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.17-presubmits.yaml @@ -97,7 +97,7 @@ presubmits: - ^release-4\.17$ - ^release-4\.17- cluster: build07 - context: ci/prow/e2e-aws-capi-techpreview + context: ci/prow/e2e-aws-operator decorate: true decoration_config: oauth_token_secret: @@ -109,10 +109,10 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-machine-approver-release-4.17-e2e-aws-capi-techpreview + name: pull-ci-openshift-priv-cluster-machine-approver-release-4.17-e2e-aws-operator path_alias: github.com/openshift/cluster-machine-approver - rerun_command: /test e2e-aws-capi-techpreview - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ + rerun_command: /test e2e-aws-operator + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ spec: containers: - args: @@ -122,7 +122,7 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-capi-techpreview + - --target=e2e-aws-operator command: - ci-operator env: @@ -181,14 +181,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.17$ - ^release-4\.17- cluster: build07 - context: ci/prow/e2e-aws-operator + context: ci/prow/e2e-aws-techpreview-post-install decorate: true decoration_config: oauth_token_secret: @@ -200,10 +200,10 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-machine-approver-release-4.17-e2e-aws-operator + name: pull-ci-openshift-priv-cluster-machine-approver-release-4.17-e2e-aws-techpreview-post-install path_alias: github.com/openshift/cluster-machine-approver - rerun_command: /test e2e-aws-operator - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ + rerun_command: /test e2e-aws-techpreview-post-install + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ spec: containers: - args: @@ -213,7 +213,7 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-operator + - --target=e2e-aws-techpreview-post-install command: - ci-operator env: @@ -272,13 +272,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-techpreview-post-install,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.17$ - ^release-4\.17- - cluster: build04 + cluster: build06 context: ci/prow/e2e-azure-operator decorate: true decoration_config: @@ -551,7 +551,7 @@ presubmits: branches: - ^release-4\.17$ - ^release-4\.17- - cluster: build04 + cluster: build06 context: ci/prow/images decorate: true decoration_config: @@ -614,7 +614,7 @@ presubmits: branches: - ^release-4\.17$ - ^release-4\.17- - cluster: build04 + cluster: build06 context: ci/prow/unit decorate: true decoration_config: diff --git a/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.18-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.18-presubmits.yaml index e1a7a8b72a9bc..49d35d690ba83 100644 --- a/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.18-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.18-presubmits.yaml @@ -97,7 +97,7 @@ presubmits: - ^release-4\.18$ - ^release-4\.18- cluster: build07 - context: ci/prow/e2e-aws-capi-techpreview + context: ci/prow/e2e-aws-operator decorate: true decoration_config: oauth_token_secret: @@ -109,10 +109,10 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-machine-approver-release-4.18-e2e-aws-capi-techpreview + name: pull-ci-openshift-priv-cluster-machine-approver-release-4.18-e2e-aws-operator path_alias: github.com/openshift/cluster-machine-approver - rerun_command: /test e2e-aws-capi-techpreview - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ + rerun_command: /test e2e-aws-operator + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ spec: containers: - args: @@ -122,7 +122,7 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-capi-techpreview + - --target=e2e-aws-operator command: - ci-operator env: @@ -181,14 +181,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.18$ - ^release-4\.18- cluster: build07 - context: ci/prow/e2e-aws-operator + context: ci/prow/e2e-aws-techpreview-post-install decorate: true decoration_config: oauth_token_secret: @@ -200,10 +200,10 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-machine-approver-release-4.18-e2e-aws-operator + name: pull-ci-openshift-priv-cluster-machine-approver-release-4.18-e2e-aws-techpreview-post-install path_alias: github.com/openshift/cluster-machine-approver - rerun_command: /test e2e-aws-operator - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ + rerun_command: /test e2e-aws-techpreview-post-install + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ spec: containers: - args: @@ -213,7 +213,7 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-operator + - --target=e2e-aws-techpreview-post-install command: - ci-operator env: @@ -272,13 +272,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-techpreview-post-install,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.18$ - ^release-4\.18- - cluster: build04 + cluster: build06 context: ci/prow/e2e-azure-operator decorate: true decoration_config: @@ -551,7 +551,7 @@ presubmits: branches: - ^release-4\.18$ - ^release-4\.18- - cluster: build04 + cluster: build06 context: ci/prow/images decorate: true decoration_config: @@ -614,7 +614,7 @@ presubmits: branches: - ^release-4\.18$ - ^release-4\.18- - cluster: build04 + cluster: build06 context: ci/prow/unit decorate: true decoration_config: diff --git a/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.19-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.19-presubmits.yaml index f2e25047b22b9..f2f28a53a2fd5 100644 --- a/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.19-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.19-presubmits.yaml @@ -97,7 +97,7 @@ presubmits: - ^release-4\.19$ - ^release-4\.19- cluster: build07 - context: ci/prow/e2e-aws-capi-techpreview + context: ci/prow/e2e-aws-operator decorate: true decoration_config: oauth_token_secret: @@ -109,10 +109,10 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-machine-approver-release-4.19-e2e-aws-capi-techpreview + name: pull-ci-openshift-priv-cluster-machine-approver-release-4.19-e2e-aws-operator path_alias: github.com/openshift/cluster-machine-approver - rerun_command: /test e2e-aws-capi-techpreview - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ + rerun_command: /test e2e-aws-operator + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ spec: containers: - args: @@ -122,7 +122,7 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-capi-techpreview + - --target=e2e-aws-operator command: - ci-operator env: @@ -181,14 +181,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.19$ - ^release-4\.19- cluster: build07 - context: ci/prow/e2e-aws-operator + context: ci/prow/e2e-aws-techpreview-post-install decorate: true decoration_config: oauth_token_secret: @@ -200,10 +200,10 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-machine-approver-release-4.19-e2e-aws-operator + name: pull-ci-openshift-priv-cluster-machine-approver-release-4.19-e2e-aws-techpreview-post-install path_alias: github.com/openshift/cluster-machine-approver - rerun_command: /test e2e-aws-operator - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ + rerun_command: /test e2e-aws-techpreview-post-install + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ spec: containers: - args: @@ -213,7 +213,7 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-operator + - --target=e2e-aws-techpreview-post-install command: - ci-operator env: @@ -272,7 +272,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-techpreview-post-install,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.20-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.20-presubmits.yaml index c4a8bee070660..0ea40e0c16c14 100644 --- a/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.20-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.20-presubmits.yaml @@ -97,7 +97,7 @@ presubmits: - ^release-4\.20$ - ^release-4\.20- cluster: build07 - context: ci/prow/e2e-aws-capi-techpreview + context: ci/prow/e2e-aws-operator decorate: true decoration_config: oauth_token_secret: @@ -109,10 +109,10 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-machine-approver-release-4.20-e2e-aws-capi-techpreview + name: pull-ci-openshift-priv-cluster-machine-approver-release-4.20-e2e-aws-operator path_alias: github.com/openshift/cluster-machine-approver - rerun_command: /test e2e-aws-capi-techpreview - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ + rerun_command: /test e2e-aws-operator + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ spec: containers: - args: @@ -122,7 +122,7 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-capi-techpreview + - --target=e2e-aws-operator command: - ci-operator env: @@ -181,14 +181,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.20$ - ^release-4\.20- cluster: build07 - context: ci/prow/e2e-aws-operator + context: ci/prow/e2e-aws-techpreview-post-install decorate: true decoration_config: oauth_token_secret: @@ -200,10 +200,10 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-machine-approver-release-4.20-e2e-aws-operator + name: pull-ci-openshift-priv-cluster-machine-approver-release-4.20-e2e-aws-techpreview-post-install path_alias: github.com/openshift/cluster-machine-approver - rerun_command: /test e2e-aws-operator - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ + rerun_command: /test e2e-aws-techpreview-post-install + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ spec: containers: - args: @@ -213,7 +213,7 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-operator + - --target=e2e-aws-techpreview-post-install command: - ci-operator env: @@ -272,13 +272,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-techpreview-post-install,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.20$ - ^release-4\.20- - cluster: build06 + cluster: build11 context: ci/prow/e2e-azure-operator decorate: true decoration_config: @@ -551,7 +551,7 @@ presubmits: branches: - ^release-4\.20$ - ^release-4\.20- - cluster: build06 + cluster: build11 context: ci/prow/images decorate: true decoration_config: @@ -614,7 +614,7 @@ presubmits: branches: - ^release-4\.20$ - ^release-4\.20- - cluster: build06 + cluster: build11 context: ci/prow/unit decorate: true decoration_config: @@ -685,7 +685,7 @@ presubmits: branches: - ^release-4\.20$ - ^release-4\.20- - cluster: build06 + cluster: build11 context: ci/prow/verify-deps decorate: true decoration_config: diff --git a/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.21-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.21-presubmits.yaml index 99fb5232e67d3..94c64c8ce7321 100644 --- a/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.21-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.21-presubmits.yaml @@ -97,7 +97,7 @@ presubmits: - ^release-4\.21$ - ^release-4\.21- cluster: build07 - context: ci/prow/e2e-aws-capi-techpreview + context: ci/prow/e2e-aws-operator decorate: true decoration_config: oauth_token_secret: @@ -109,10 +109,10 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-machine-approver-release-4.21-e2e-aws-capi-techpreview + name: pull-ci-openshift-priv-cluster-machine-approver-release-4.21-e2e-aws-operator path_alias: github.com/openshift/cluster-machine-approver - rerun_command: /test e2e-aws-capi-techpreview - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ + rerun_command: /test e2e-aws-operator + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ spec: containers: - args: @@ -122,7 +122,7 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-capi-techpreview + - --target=e2e-aws-operator command: - ci-operator env: @@ -181,14 +181,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.21$ - ^release-4\.21- cluster: build07 - context: ci/prow/e2e-aws-operator + context: ci/prow/e2e-aws-techpreview-post-install decorate: true decoration_config: oauth_token_secret: @@ -200,10 +200,10 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-machine-approver-release-4.21-e2e-aws-operator + name: pull-ci-openshift-priv-cluster-machine-approver-release-4.21-e2e-aws-techpreview-post-install path_alias: github.com/openshift/cluster-machine-approver - rerun_command: /test e2e-aws-operator - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ + rerun_command: /test e2e-aws-techpreview-post-install + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ spec: containers: - args: @@ -213,7 +213,7 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-operator + - --target=e2e-aws-techpreview-post-install command: - ci-operator env: @@ -272,7 +272,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-techpreview-post-install,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.22-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.22-presubmits.yaml index 6b6391b0ff262..1105de1c37891 100644 --- a/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.22-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.22-presubmits.yaml @@ -97,7 +97,7 @@ presubmits: - ^release-4\.22$ - ^release-4\.22- cluster: build07 - context: ci/prow/e2e-aws-capi-techpreview + context: ci/prow/e2e-aws-operator decorate: true decoration_config: oauth_token_secret: @@ -109,10 +109,10 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-machine-approver-release-4.22-e2e-aws-capi-techpreview + name: pull-ci-openshift-priv-cluster-machine-approver-release-4.22-e2e-aws-operator path_alias: github.com/openshift/cluster-machine-approver - rerun_command: /test e2e-aws-capi-techpreview - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ + rerun_command: /test e2e-aws-operator + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ spec: containers: - args: @@ -122,7 +122,7 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-capi-techpreview + - --target=e2e-aws-operator command: - ci-operator env: @@ -181,14 +181,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.22$ - ^release-4\.22- cluster: build07 - context: ci/prow/e2e-aws-operator + context: ci/prow/e2e-aws-techpreview-post-install decorate: true decoration_config: oauth_token_secret: @@ -200,10 +200,10 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-machine-approver-release-4.22-e2e-aws-operator + name: pull-ci-openshift-priv-cluster-machine-approver-release-4.22-e2e-aws-techpreview-post-install path_alias: github.com/openshift/cluster-machine-approver - rerun_command: /test e2e-aws-operator - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ + rerun_command: /test e2e-aws-techpreview-post-install + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ spec: containers: - args: @@ -213,7 +213,7 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-operator + - --target=e2e-aws-techpreview-post-install command: - ci-operator env: @@ -272,7 +272,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-techpreview-post-install,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.23-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.23-presubmits.yaml index f2ad3c7a3a58d..c43776fe6e481 100644 --- a/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.23-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.23-presubmits.yaml @@ -97,7 +97,7 @@ presubmits: - ^release-4\.23$ - ^release-4\.23- cluster: build07 - context: ci/prow/e2e-aws-capi-techpreview + context: ci/prow/e2e-aws-operator decorate: true decoration_config: oauth_token_secret: @@ -109,10 +109,10 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-machine-approver-release-4.23-e2e-aws-capi-techpreview + name: pull-ci-openshift-priv-cluster-machine-approver-release-4.23-e2e-aws-operator path_alias: github.com/openshift/cluster-machine-approver - rerun_command: /test e2e-aws-capi-techpreview - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ + rerun_command: /test e2e-aws-operator + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ spec: containers: - args: @@ -122,7 +122,7 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-capi-techpreview + - --target=e2e-aws-operator command: - ci-operator env: @@ -181,14 +181,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.23$ - ^release-4\.23- cluster: build07 - context: ci/prow/e2e-aws-operator + context: ci/prow/e2e-aws-techpreview-post-install decorate: true decoration_config: oauth_token_secret: @@ -200,10 +200,10 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-machine-approver-release-4.23-e2e-aws-operator + name: pull-ci-openshift-priv-cluster-machine-approver-release-4.23-e2e-aws-techpreview-post-install path_alias: github.com/openshift/cluster-machine-approver - rerun_command: /test e2e-aws-operator - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ + rerun_command: /test e2e-aws-techpreview-post-install + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ spec: containers: - args: @@ -213,7 +213,7 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-operator + - --target=e2e-aws-techpreview-post-install command: - ci-operator env: @@ -272,7 +272,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-techpreview-post-install,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-5.0-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-5.0-presubmits.yaml index 9fdfc9fdcf53b..5fea6ba73b1d7 100644 --- a/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-5.0-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-5.0-presubmits.yaml @@ -97,7 +97,7 @@ presubmits: - ^release-5\.0$ - ^release-5\.0- cluster: build06 - context: ci/prow/e2e-aws-capi-techpreview + context: ci/prow/e2e-aws-operator decorate: true decoration_config: oauth_token_secret: @@ -109,10 +109,10 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-machine-approver-release-5.0-e2e-aws-capi-techpreview + name: pull-ci-openshift-priv-cluster-machine-approver-release-5.0-e2e-aws-operator path_alias: github.com/openshift/cluster-machine-approver - rerun_command: /test e2e-aws-capi-techpreview - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ + rerun_command: /test e2e-aws-operator + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ spec: containers: - args: @@ -122,7 +122,7 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-capi-techpreview + - --target=e2e-aws-operator command: - ci-operator env: @@ -181,14 +181,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-5\.0$ - ^release-5\.0- cluster: build06 - context: ci/prow/e2e-aws-operator + context: ci/prow/e2e-aws-techpreview-post-install decorate: true decoration_config: oauth_token_secret: @@ -200,10 +200,10 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-machine-approver-release-5.0-e2e-aws-operator + name: pull-ci-openshift-priv-cluster-machine-approver-release-5.0-e2e-aws-techpreview-post-install path_alias: github.com/openshift/cluster-machine-approver - rerun_command: /test e2e-aws-operator - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ + rerun_command: /test e2e-aws-techpreview-post-install + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ spec: containers: - args: @@ -213,7 +213,7 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-operator + - --target=e2e-aws-techpreview-post-install command: - ci-operator env: @@ -272,7 +272,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-techpreview-post-install,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-5.1-presubmits.yaml b/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-5.1-presubmits.yaml index dc42b893be318..7e5759ad2bb9e 100644 --- a/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-5.1-presubmits.yaml +++ b/ci-operator/jobs/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-5.1-presubmits.yaml @@ -5,7 +5,7 @@ presubmits: branches: - ^release-5\.1$ - ^release-5\.1- - cluster: build06 + cluster: build07 context: ci/prow/e2e-aws decorate: true decoration_config: @@ -96,8 +96,8 @@ presubmits: branches: - ^release-5\.1$ - ^release-5\.1- - cluster: build06 - context: ci/prow/e2e-aws-capi-techpreview + cluster: build07 + context: ci/prow/e2e-aws-operator decorate: true decoration_config: oauth_token_secret: @@ -109,10 +109,10 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-machine-approver-release-5.1-e2e-aws-capi-techpreview + name: pull-ci-openshift-priv-cluster-machine-approver-release-5.1-e2e-aws-operator path_alias: github.com/openshift/cluster-machine-approver - rerun_command: /test e2e-aws-capi-techpreview - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ + rerun_command: /test e2e-aws-operator + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ spec: containers: - args: @@ -122,7 +122,7 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-capi-techpreview + - --target=e2e-aws-operator command: - ci-operator env: @@ -181,14 +181,14 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-5\.1$ - ^release-5\.1- cluster: build06 - context: ci/prow/e2e-aws-operator + context: ci/prow/e2e-aws-techpreview-post-install decorate: true decoration_config: oauth_token_secret: @@ -200,10 +200,10 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-priv-cluster-machine-approver-release-5.1-e2e-aws-operator + name: pull-ci-openshift-priv-cluster-machine-approver-release-5.1-e2e-aws-techpreview-post-install path_alias: github.com/openshift/cluster-machine-approver - rerun_command: /test e2e-aws-operator - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ + rerun_command: /test e2e-aws-techpreview-post-install + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ spec: containers: - args: @@ -213,7 +213,7 @@ presubmits: - --oauth-token-path=/usr/local/github-credentials/oauth - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-operator + - --target=e2e-aws-techpreview-post-install command: - ci-operator env: @@ -272,7 +272,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-techpreview-post-install,?($|\s.*) - agent: kubernetes always_run: false branches: @@ -369,7 +369,7 @@ presubmits: branches: - ^release-5\.1$ - ^release-5\.1- - cluster: build08 + cluster: build04 context: ci/prow/e2e-gcp-operator decorate: true decoration_config: @@ -642,7 +642,7 @@ presubmits: branches: - ^release-5\.1$ - ^release-5\.1- - cluster: build06 + cluster: build07 context: ci/prow/e2e-upgrade decorate: true decoration_config: diff --git a/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-main-presubmits.yaml b/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-main-presubmits.yaml index eefbbcf064fe9..274294e565342 100644 --- a/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-main-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-main-presubmits.yaml @@ -87,16 +87,16 @@ presubmits: - ^main$ - ^main- cluster: build11 - context: ci/prow/e2e-aws-capi-techpreview + context: ci/prow/e2e-aws-operator decorate: true labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-machine-approver-main-e2e-aws-capi-techpreview - rerun_command: /test e2e-aws-capi-techpreview - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ + name: pull-ci-openshift-cluster-machine-approver-main-e2e-aws-operator + rerun_command: /test e2e-aws-operator + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ spec: containers: - args: @@ -105,7 +105,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-capi-techpreview + - --target=e2e-aws-operator command: - ci-operator env: @@ -161,23 +161,23 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- cluster: build11 - context: ci/prow/e2e-aws-operator + context: ci/prow/e2e-aws-techpreview-post-install decorate: true labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-machine-approver-main-e2e-aws-operator - rerun_command: /test e2e-aws-operator - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ + name: pull-ci-openshift-cluster-machine-approver-main-e2e-aws-techpreview-post-install + rerun_command: /test e2e-aws-techpreview-post-install + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ spec: containers: - args: @@ -186,7 +186,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-operator + - --target=e2e-aws-techpreview-post-install command: - ci-operator env: @@ -242,13 +242,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-techpreview-post-install,?($|\s.*) - agent: kubernetes always_run: false branches: - ^main$ - ^main- - cluster: build06 + cluster: build09 context: ci/prow/e2e-azure-operator decorate: true labels: @@ -410,7 +410,7 @@ presubmits: branches: - ^main$ - ^main- - cluster: build06 + cluster: build09 context: ci/prow/e2e-hypershift-aks decorate: true labels: @@ -491,7 +491,7 @@ presubmits: branches: - ^main$ - ^main- - cluster: build06 + cluster: build09 context: ci/prow/e2e-hypershift-aws decorate: true labels: @@ -653,7 +653,7 @@ presubmits: branches: - ^main$ - ^main- - cluster: build06 + cluster: build09 context: ci/prow/images decorate: true labels: @@ -792,7 +792,7 @@ presubmits: branches: - ^main$ - ^main- - cluster: build06 + cluster: build09 context: ci/prow/okd-scos-images decorate: true decoration_config: @@ -850,7 +850,7 @@ presubmits: branches: - ^main$ - ^main- - cluster: build06 + cluster: build09 context: ci/prow/unit decorate: true labels: @@ -911,7 +911,7 @@ presubmits: branches: - ^main$ - ^main- - cluster: build06 + cluster: build09 context: ci/prow/verify-deps decorate: true labels: diff --git a/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.11-presubmits.yaml b/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.11-presubmits.yaml index 5fe58264fccab..455db67389c71 100644 --- a/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.11-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.11-presubmits.yaml @@ -81,20 +81,21 @@ presubmits: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*) - agent: kubernetes - always_run: true + always_run: false branches: - ^release-4\.11$ - ^release-4\.11- cluster: build11 - context: ci/prow/e2e-aws-capi-techpreview + context: ci/prow/e2e-aws-disruptive decorate: true labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-machine-approver-release-4.11-e2e-aws-capi-techpreview - rerun_command: /test e2e-aws-capi-techpreview + name: pull-ci-openshift-cluster-machine-approver-release-4.11-e2e-aws-disruptive + optional: true + rerun_command: /test e2e-aws-disruptive spec: containers: - args: @@ -103,7 +104,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-capi-techpreview + - --target=e2e-aws-disruptive command: - ci-operator env: @@ -159,23 +160,22 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*) - agent: kubernetes - always_run: false + always_run: true branches: - ^release-4\.11$ - ^release-4\.11- cluster: build11 - context: ci/prow/e2e-aws-disruptive + context: ci/prow/e2e-aws-operator decorate: true labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-machine-approver-release-4.11-e2e-aws-disruptive - optional: true - rerun_command: /test e2e-aws-disruptive + name: pull-ci-openshift-cluster-machine-approver-release-4.11-e2e-aws-operator + rerun_command: /test e2e-aws-operator spec: containers: - args: @@ -184,7 +184,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-disruptive + - --target=e2e-aws-operator command: - ci-operator env: @@ -240,22 +240,22 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) - agent: kubernetes always_run: true branches: - ^release-4\.11$ - ^release-4\.11- cluster: build11 - context: ci/prow/e2e-aws-operator + context: ci/prow/e2e-aws-techpreview-post-install decorate: true labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-machine-approver-release-4.11-e2e-aws-operator - rerun_command: /test e2e-aws-operator + name: pull-ci-openshift-cluster-machine-approver-release-4.11-e2e-aws-techpreview-post-install + rerun_command: /test e2e-aws-techpreview-post-install spec: containers: - args: @@ -264,7 +264,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-operator + - --target=e2e-aws-techpreview-post-install command: - ci-operator env: @@ -320,7 +320,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-techpreview-post-install,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.12-presubmits.yaml index 16f14c60775d7..04884f0b65ea3 100644 --- a/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.12-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.12-presubmits.yaml @@ -86,15 +86,15 @@ presubmits: - ^release-4\.12$ - ^release-4\.12- cluster: build11 - context: ci/prow/e2e-aws-capi-techpreview + context: ci/prow/e2e-aws-operator decorate: true labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-machine-approver-release-4.12-e2e-aws-capi-techpreview - rerun_command: /test e2e-aws-capi-techpreview + name: pull-ci-openshift-cluster-machine-approver-release-4.12-e2e-aws-operator + rerun_command: /test e2e-aws-operator spec: containers: - args: @@ -103,7 +103,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-capi-techpreview + - --target=e2e-aws-operator command: - ci-operator env: @@ -159,22 +159,22 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) - agent: kubernetes always_run: true branches: - ^release-4\.12$ - ^release-4\.12- cluster: build11 - context: ci/prow/e2e-aws-operator + context: ci/prow/e2e-aws-techpreview-post-install decorate: true labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-machine-approver-release-4.12-e2e-aws-operator - rerun_command: /test e2e-aws-operator + name: pull-ci-openshift-cluster-machine-approver-release-4.12-e2e-aws-techpreview-post-install + rerun_command: /test e2e-aws-techpreview-post-install spec: containers: - args: @@ -183,7 +183,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-operator + - --target=e2e-aws-techpreview-post-install command: - ci-operator env: @@ -239,7 +239,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-techpreview-post-install,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.13-presubmits.yaml b/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.13-presubmits.yaml index 432bbf087fe4d..3821f54e99607 100644 --- a/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.13-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.13-presubmits.yaml @@ -87,16 +87,16 @@ presubmits: - ^release-4\.13$ - ^release-4\.13- cluster: build11 - context: ci/prow/e2e-aws-capi-techpreview + context: ci/prow/e2e-aws-operator decorate: true labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-machine-approver-release-4.13-e2e-aws-capi-techpreview - rerun_command: /test e2e-aws-capi-techpreview - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ + name: pull-ci-openshift-cluster-machine-approver-release-4.13-e2e-aws-operator + rerun_command: /test e2e-aws-operator + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ spec: containers: - args: @@ -105,7 +105,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-capi-techpreview + - --target=e2e-aws-operator command: - ci-operator env: @@ -161,23 +161,23 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.13$ - ^release-4\.13- cluster: build11 - context: ci/prow/e2e-aws-operator + context: ci/prow/e2e-aws-techpreview-post-install decorate: true labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-machine-approver-release-4.13-e2e-aws-operator - rerun_command: /test e2e-aws-operator - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ + name: pull-ci-openshift-cluster-machine-approver-release-4.13-e2e-aws-techpreview-post-install + rerun_command: /test e2e-aws-techpreview-post-install + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ spec: containers: - args: @@ -186,7 +186,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-operator + - --target=e2e-aws-techpreview-post-install command: - ci-operator env: @@ -242,7 +242,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-techpreview-post-install,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.14-presubmits.yaml b/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.14-presubmits.yaml index 8821d6107099a..1d71245dab089 100644 --- a/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.14-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.14-presubmits.yaml @@ -87,16 +87,16 @@ presubmits: - ^release-4\.14$ - ^release-4\.14- cluster: build11 - context: ci/prow/e2e-aws-capi-techpreview + context: ci/prow/e2e-aws-operator decorate: true labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-machine-approver-release-4.14-e2e-aws-capi-techpreview - rerun_command: /test e2e-aws-capi-techpreview - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ + name: pull-ci-openshift-cluster-machine-approver-release-4.14-e2e-aws-operator + rerun_command: /test e2e-aws-operator + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ spec: containers: - args: @@ -105,7 +105,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-capi-techpreview + - --target=e2e-aws-operator command: - ci-operator env: @@ -161,23 +161,23 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.14$ - ^release-4\.14- cluster: build11 - context: ci/prow/e2e-aws-operator + context: ci/prow/e2e-aws-techpreview-post-install decorate: true labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-machine-approver-release-4.14-e2e-aws-operator - rerun_command: /test e2e-aws-operator - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ + name: pull-ci-openshift-cluster-machine-approver-release-4.14-e2e-aws-techpreview-post-install + rerun_command: /test e2e-aws-techpreview-post-install + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ spec: containers: - args: @@ -186,7 +186,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-operator + - --target=e2e-aws-techpreview-post-install command: - ci-operator env: @@ -242,7 +242,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-techpreview-post-install,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.15-presubmits.yaml b/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.15-presubmits.yaml index e227f56c921ee..43ad4c8209ea2 100644 --- a/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.15-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.15-presubmits.yaml @@ -87,16 +87,16 @@ presubmits: - ^release-4\.15$ - ^release-4\.15- cluster: build11 - context: ci/prow/e2e-aws-capi-techpreview + context: ci/prow/e2e-aws-operator decorate: true labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-machine-approver-release-4.15-e2e-aws-capi-techpreview - rerun_command: /test e2e-aws-capi-techpreview - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ + name: pull-ci-openshift-cluster-machine-approver-release-4.15-e2e-aws-operator + rerun_command: /test e2e-aws-operator + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ spec: containers: - args: @@ -105,7 +105,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-capi-techpreview + - --target=e2e-aws-operator command: - ci-operator env: @@ -161,23 +161,23 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.15$ - ^release-4\.15- cluster: build11 - context: ci/prow/e2e-aws-operator + context: ci/prow/e2e-aws-techpreview-post-install decorate: true labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-machine-approver-release-4.15-e2e-aws-operator - rerun_command: /test e2e-aws-operator - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ + name: pull-ci-openshift-cluster-machine-approver-release-4.15-e2e-aws-techpreview-post-install + rerun_command: /test e2e-aws-techpreview-post-install + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ spec: containers: - args: @@ -186,7 +186,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-operator + - --target=e2e-aws-techpreview-post-install command: - ci-operator env: @@ -242,7 +242,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-techpreview-post-install,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.16-presubmits.yaml b/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.16-presubmits.yaml index 0579090e5fd62..b38ad89b977ed 100644 --- a/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.16-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.16-presubmits.yaml @@ -87,16 +87,16 @@ presubmits: - ^release-4\.16$ - ^release-4\.16- cluster: build11 - context: ci/prow/e2e-aws-capi-techpreview + context: ci/prow/e2e-aws-operator decorate: true labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-machine-approver-release-4.16-e2e-aws-capi-techpreview - rerun_command: /test e2e-aws-capi-techpreview - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ + name: pull-ci-openshift-cluster-machine-approver-release-4.16-e2e-aws-operator + rerun_command: /test e2e-aws-operator + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ spec: containers: - args: @@ -105,7 +105,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-capi-techpreview + - --target=e2e-aws-operator command: - ci-operator env: @@ -161,23 +161,23 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.16$ - ^release-4\.16- cluster: build11 - context: ci/prow/e2e-aws-operator + context: ci/prow/e2e-aws-techpreview-post-install decorate: true labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-machine-approver-release-4.16-e2e-aws-operator - rerun_command: /test e2e-aws-operator - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ + name: pull-ci-openshift-cluster-machine-approver-release-4.16-e2e-aws-techpreview-post-install + rerun_command: /test e2e-aws-techpreview-post-install + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ spec: containers: - args: @@ -186,7 +186,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-operator + - --target=e2e-aws-techpreview-post-install command: - ci-operator env: @@ -242,7 +242,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-techpreview-post-install,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.17-presubmits.yaml b/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.17-presubmits.yaml index b37801d0367d3..06dfc017e74e6 100644 --- a/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.17-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.17-presubmits.yaml @@ -87,16 +87,16 @@ presubmits: - ^release-4\.17$ - ^release-4\.17- cluster: build11 - context: ci/prow/e2e-aws-capi-techpreview + context: ci/prow/e2e-aws-operator decorate: true labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-machine-approver-release-4.17-e2e-aws-capi-techpreview - rerun_command: /test e2e-aws-capi-techpreview - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ + name: pull-ci-openshift-cluster-machine-approver-release-4.17-e2e-aws-operator + rerun_command: /test e2e-aws-operator + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ spec: containers: - args: @@ -105,7 +105,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-capi-techpreview + - --target=e2e-aws-operator command: - ci-operator env: @@ -161,23 +161,23 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.17$ - ^release-4\.17- cluster: build11 - context: ci/prow/e2e-aws-operator + context: ci/prow/e2e-aws-techpreview-post-install decorate: true labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-machine-approver-release-4.17-e2e-aws-operator - rerun_command: /test e2e-aws-operator - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ + name: pull-ci-openshift-cluster-machine-approver-release-4.17-e2e-aws-techpreview-post-install + rerun_command: /test e2e-aws-techpreview-post-install + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ spec: containers: - args: @@ -186,7 +186,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-operator + - --target=e2e-aws-techpreview-post-install command: - ci-operator env: @@ -242,7 +242,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-techpreview-post-install,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.18-presubmits.yaml b/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.18-presubmits.yaml index 9fbb3d05dafaf..f3bf9840ad55e 100644 --- a/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.18-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.18-presubmits.yaml @@ -87,16 +87,16 @@ presubmits: - ^release-4\.18$ - ^release-4\.18- cluster: build11 - context: ci/prow/e2e-aws-capi-techpreview + context: ci/prow/e2e-aws-operator decorate: true labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-machine-approver-release-4.18-e2e-aws-capi-techpreview - rerun_command: /test e2e-aws-capi-techpreview - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ + name: pull-ci-openshift-cluster-machine-approver-release-4.18-e2e-aws-operator + rerun_command: /test e2e-aws-operator + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ spec: containers: - args: @@ -105,7 +105,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-capi-techpreview + - --target=e2e-aws-operator command: - ci-operator env: @@ -161,23 +161,23 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.18$ - ^release-4\.18- cluster: build11 - context: ci/prow/e2e-aws-operator + context: ci/prow/e2e-aws-techpreview-post-install decorate: true labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-machine-approver-release-4.18-e2e-aws-operator - rerun_command: /test e2e-aws-operator - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ + name: pull-ci-openshift-cluster-machine-approver-release-4.18-e2e-aws-techpreview-post-install + rerun_command: /test e2e-aws-techpreview-post-install + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ spec: containers: - args: @@ -186,7 +186,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-operator + - --target=e2e-aws-techpreview-post-install command: - ci-operator env: @@ -242,7 +242,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-techpreview-post-install,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.19-presubmits.yaml b/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.19-presubmits.yaml index 00c112e35e852..955f6f945d2bb 100644 --- a/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.19-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.19-presubmits.yaml @@ -87,16 +87,16 @@ presubmits: - ^release-4\.19$ - ^release-4\.19- cluster: build11 - context: ci/prow/e2e-aws-capi-techpreview + context: ci/prow/e2e-aws-operator decorate: true labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-machine-approver-release-4.19-e2e-aws-capi-techpreview - rerun_command: /test e2e-aws-capi-techpreview - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ + name: pull-ci-openshift-cluster-machine-approver-release-4.19-e2e-aws-operator + rerun_command: /test e2e-aws-operator + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ spec: containers: - args: @@ -105,7 +105,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-capi-techpreview + - --target=e2e-aws-operator command: - ci-operator env: @@ -161,23 +161,23 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.19$ - ^release-4\.19- cluster: build11 - context: ci/prow/e2e-aws-operator + context: ci/prow/e2e-aws-techpreview-post-install decorate: true labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-machine-approver-release-4.19-e2e-aws-operator - rerun_command: /test e2e-aws-operator - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ + name: pull-ci-openshift-cluster-machine-approver-release-4.19-e2e-aws-techpreview-post-install + rerun_command: /test e2e-aws-techpreview-post-install + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ spec: containers: - args: @@ -186,7 +186,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-operator + - --target=e2e-aws-techpreview-post-install command: - ci-operator env: @@ -242,7 +242,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-techpreview-post-install,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.20-presubmits.yaml b/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.20-presubmits.yaml index 50031d8b79867..73102a8a82e00 100644 --- a/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.20-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.20-presubmits.yaml @@ -87,16 +87,16 @@ presubmits: - ^release-4\.20$ - ^release-4\.20- cluster: build11 - context: ci/prow/e2e-aws-capi-techpreview + context: ci/prow/e2e-aws-operator decorate: true labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-machine-approver-release-4.20-e2e-aws-capi-techpreview - rerun_command: /test e2e-aws-capi-techpreview - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ + name: pull-ci-openshift-cluster-machine-approver-release-4.20-e2e-aws-operator + rerun_command: /test e2e-aws-operator + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ spec: containers: - args: @@ -105,7 +105,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-capi-techpreview + - --target=e2e-aws-operator command: - ci-operator env: @@ -161,23 +161,23 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.20$ - ^release-4\.20- cluster: build11 - context: ci/prow/e2e-aws-operator + context: ci/prow/e2e-aws-techpreview-post-install decorate: true labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-machine-approver-release-4.20-e2e-aws-operator - rerun_command: /test e2e-aws-operator - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ + name: pull-ci-openshift-cluster-machine-approver-release-4.20-e2e-aws-techpreview-post-install + rerun_command: /test e2e-aws-techpreview-post-install + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ spec: containers: - args: @@ -186,7 +186,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-operator + - --target=e2e-aws-techpreview-post-install command: - ci-operator env: @@ -242,7 +242,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-techpreview-post-install,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.21-presubmits.yaml b/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.21-presubmits.yaml index afbd29332293a..e42485260e1d6 100644 --- a/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.21-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.21-presubmits.yaml @@ -87,16 +87,16 @@ presubmits: - ^release-4\.21$ - ^release-4\.21- cluster: build11 - context: ci/prow/e2e-aws-capi-techpreview + context: ci/prow/e2e-aws-operator decorate: true labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-machine-approver-release-4.21-e2e-aws-capi-techpreview - rerun_command: /test e2e-aws-capi-techpreview - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ + name: pull-ci-openshift-cluster-machine-approver-release-4.21-e2e-aws-operator + rerun_command: /test e2e-aws-operator + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ spec: containers: - args: @@ -105,7 +105,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-capi-techpreview + - --target=e2e-aws-operator command: - ci-operator env: @@ -161,23 +161,23 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.21$ - ^release-4\.21- cluster: build11 - context: ci/prow/e2e-aws-operator + context: ci/prow/e2e-aws-techpreview-post-install decorate: true labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-machine-approver-release-4.21-e2e-aws-operator - rerun_command: /test e2e-aws-operator - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ + name: pull-ci-openshift-cluster-machine-approver-release-4.21-e2e-aws-techpreview-post-install + rerun_command: /test e2e-aws-techpreview-post-install + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ spec: containers: - args: @@ -186,7 +186,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-operator + - --target=e2e-aws-techpreview-post-install command: - ci-operator env: @@ -242,7 +242,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-techpreview-post-install,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.22-presubmits.yaml b/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.22-presubmits.yaml index 125100acc4d2f..3e9489ef5dbe2 100644 --- a/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.22-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.22-presubmits.yaml @@ -87,16 +87,16 @@ presubmits: - ^release-4\.22$ - ^release-4\.22- cluster: build11 - context: ci/prow/e2e-aws-capi-techpreview + context: ci/prow/e2e-aws-operator decorate: true labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-machine-approver-release-4.22-e2e-aws-capi-techpreview - rerun_command: /test e2e-aws-capi-techpreview - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ + name: pull-ci-openshift-cluster-machine-approver-release-4.22-e2e-aws-operator + rerun_command: /test e2e-aws-operator + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ spec: containers: - args: @@ -105,7 +105,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-capi-techpreview + - --target=e2e-aws-operator command: - ci-operator env: @@ -161,23 +161,23 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.22$ - ^release-4\.22- cluster: build11 - context: ci/prow/e2e-aws-operator + context: ci/prow/e2e-aws-techpreview-post-install decorate: true labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-machine-approver-release-4.22-e2e-aws-operator - rerun_command: /test e2e-aws-operator - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ + name: pull-ci-openshift-cluster-machine-approver-release-4.22-e2e-aws-techpreview-post-install + rerun_command: /test e2e-aws-techpreview-post-install + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ spec: containers: - args: @@ -186,7 +186,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-operator + - --target=e2e-aws-techpreview-post-install command: - ci-operator env: @@ -242,7 +242,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-techpreview-post-install,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.23-presubmits.yaml b/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.23-presubmits.yaml index 46a42d0339e67..bac4c4639391e 100644 --- a/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.23-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.23-presubmits.yaml @@ -87,16 +87,16 @@ presubmits: - ^release-4\.23$ - ^release-4\.23- cluster: build11 - context: ci/prow/e2e-aws-capi-techpreview + context: ci/prow/e2e-aws-operator decorate: true labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-machine-approver-release-4.23-e2e-aws-capi-techpreview - rerun_command: /test e2e-aws-capi-techpreview - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ + name: pull-ci-openshift-cluster-machine-approver-release-4.23-e2e-aws-operator + rerun_command: /test e2e-aws-operator + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ spec: containers: - args: @@ -105,7 +105,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-capi-techpreview + - --target=e2e-aws-operator command: - ci-operator env: @@ -161,23 +161,23 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.23$ - ^release-4\.23- cluster: build11 - context: ci/prow/e2e-aws-operator + context: ci/prow/e2e-aws-techpreview-post-install decorate: true labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-machine-approver-release-4.23-e2e-aws-operator - rerun_command: /test e2e-aws-operator - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ + name: pull-ci-openshift-cluster-machine-approver-release-4.23-e2e-aws-techpreview-post-install + rerun_command: /test e2e-aws-techpreview-post-install + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ spec: containers: - args: @@ -186,7 +186,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-operator + - --target=e2e-aws-techpreview-post-install command: - ci-operator env: @@ -242,13 +242,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-techpreview-post-install,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-4\.23$ - ^release-4\.23- - cluster: build06 + cluster: build09 context: ci/prow/e2e-azure-operator decorate: true labels: @@ -410,7 +410,7 @@ presubmits: branches: - ^release-4\.23$ - ^release-4\.23- - cluster: build06 + cluster: build09 context: ci/prow/e2e-hypershift-aks decorate: true labels: @@ -491,7 +491,7 @@ presubmits: branches: - ^release-4\.23$ - ^release-4\.23- - cluster: build06 + cluster: build09 context: ci/prow/e2e-hypershift-aws decorate: true labels: @@ -653,7 +653,7 @@ presubmits: branches: - ^release-4\.23$ - ^release-4\.23- - cluster: build06 + cluster: build09 context: ci/prow/images decorate: true labels: @@ -707,7 +707,7 @@ presubmits: branches: - ^release-4\.23$ - ^release-4\.23- - cluster: build06 + cluster: build09 context: ci/prow/unit decorate: true labels: @@ -768,7 +768,7 @@ presubmits: branches: - ^release-4\.23$ - ^release-4\.23- - cluster: build06 + cluster: build09 context: ci/prow/verify-deps decorate: true labels: diff --git a/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-5.0-presubmits.yaml b/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-5.0-presubmits.yaml index 532592f048645..211004e7fc43d 100644 --- a/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-5.0-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-5.0-presubmits.yaml @@ -87,16 +87,16 @@ presubmits: - ^release-5\.0$ - ^release-5\.0- cluster: build10 - context: ci/prow/e2e-aws-capi-techpreview + context: ci/prow/e2e-aws-operator decorate: true labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-machine-approver-release-5.0-e2e-aws-capi-techpreview - rerun_command: /test e2e-aws-capi-techpreview - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ + name: pull-ci-openshift-cluster-machine-approver-release-5.0-e2e-aws-operator + rerun_command: /test e2e-aws-operator + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ spec: containers: - args: @@ -105,7 +105,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-capi-techpreview + - --target=e2e-aws-operator command: - ci-operator env: @@ -161,23 +161,23 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-5\.0$ - ^release-5\.0- cluster: build10 - context: ci/prow/e2e-aws-operator + context: ci/prow/e2e-aws-techpreview-post-install decorate: true labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-machine-approver-release-5.0-e2e-aws-operator - rerun_command: /test e2e-aws-operator - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ + name: pull-ci-openshift-cluster-machine-approver-release-5.0-e2e-aws-techpreview-post-install + rerun_command: /test e2e-aws-techpreview-post-install + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ spec: containers: - args: @@ -186,7 +186,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-operator + - --target=e2e-aws-techpreview-post-install command: - ci-operator env: @@ -242,7 +242,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-techpreview-post-install,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-5.1-presubmits.yaml b/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-5.1-presubmits.yaml index d92533dd98af1..b75de413e6e2c 100644 --- a/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-5.1-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-5.1-presubmits.yaml @@ -5,7 +5,7 @@ presubmits: branches: - ^release-5\.1$ - ^release-5\.1- - cluster: build10 + cluster: build11 context: ci/prow/e2e-aws decorate: true labels: @@ -86,17 +86,17 @@ presubmits: branches: - ^release-5\.1$ - ^release-5\.1- - cluster: build10 - context: ci/prow/e2e-aws-capi-techpreview + cluster: build11 + context: ci/prow/e2e-aws-operator decorate: true labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-machine-approver-release-5.1-e2e-aws-capi-techpreview - rerun_command: /test e2e-aws-capi-techpreview - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ + name: pull-ci-openshift-cluster-machine-approver-release-5.1-e2e-aws-operator + rerun_command: /test e2e-aws-operator + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ spec: containers: - args: @@ -105,7 +105,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-capi-techpreview + - --target=e2e-aws-operator command: - ci-operator env: @@ -161,23 +161,23 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-capi-techpreview,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-5\.1$ - ^release-5\.1- cluster: build10 - context: ci/prow/e2e-aws-operator + context: ci/prow/e2e-aws-techpreview-post-install decorate: true labels: ci-operator.openshift.io/cloud: aws ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-machine-approver-release-5.1-e2e-aws-operator - rerun_command: /test e2e-aws-operator - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$|_test\.go$ + name: pull-ci-openshift-cluster-machine-approver-release-5.1-e2e-aws-techpreview-post-install + rerun_command: /test e2e-aws-techpreview-post-install + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ spec: containers: - args: @@ -186,7 +186,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-aws-operator + - --target=e2e-aws-techpreview-post-install command: - ci-operator env: @@ -242,13 +242,13 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-aws-techpreview-post-install,?($|\s.*) - agent: kubernetes always_run: false branches: - ^release-5\.1$ - ^release-5\.1- - cluster: build06 + cluster: build09 context: ci/prow/e2e-azure-operator decorate: true labels: @@ -329,7 +329,7 @@ presubmits: branches: - ^release-5\.1$ - ^release-5\.1- - cluster: build04 + cluster: build08 context: ci/prow/e2e-gcp-operator decorate: true labels: @@ -410,7 +410,7 @@ presubmits: branches: - ^release-5\.1$ - ^release-5\.1- - cluster: build06 + cluster: build09 context: ci/prow/e2e-hypershift-aks decorate: true labels: @@ -491,7 +491,7 @@ presubmits: branches: - ^release-5\.1$ - ^release-5\.1- - cluster: build06 + cluster: build09 context: ci/prow/e2e-hypershift-aws decorate: true labels: @@ -572,7 +572,7 @@ presubmits: branches: - ^release-5\.1$ - ^release-5\.1- - cluster: build10 + cluster: build11 context: ci/prow/e2e-upgrade decorate: true labels: @@ -653,7 +653,7 @@ presubmits: branches: - ^release-5\.1$ - ^release-5\.1- - cluster: build06 + cluster: build09 context: ci/prow/images decorate: true labels: @@ -707,7 +707,7 @@ presubmits: branches: - ^release-5\.1$ - ^release-5\.1- - cluster: build06 + cluster: build09 context: ci/prow/unit decorate: true labels: @@ -768,7 +768,7 @@ presubmits: branches: - ^release-5\.1$ - ^release-5\.1- - cluster: build06 + cluster: build09 context: ci/prow/verify-deps decorate: true labels: From 9af37270a1e7905a5b3950f28f1d4e0326233916 Mon Sep 17 00:00:00 2001 From: Damiano Donati Date: Sun, 19 Apr 2026 11:41:48 +0200 Subject: [PATCH 5/5] 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. --- ...riv-cluster-api-operator-release-4.13.yaml | 2 +- ...iv-cluster-capi-operator-release-4.11.yaml | 4 ++-- ...cluster-machine-approver-release-4.11.yaml | 2 +- ...cluster-machine-approver-release-4.12.yaml | 2 +- ...cluster-machine-approver-release-4.13.yaml | 2 +- ...ift-cluster-api-operator-release-4.13.yaml | 2 +- ...ft-cluster-capi-operator-release-4.11.yaml | 4 ++-- ...cluster-machine-approver-release-4.11.yaml | 2 +- ...cluster-machine-approver-release-4.12.yaml | 2 +- ...cluster-machine-approver-release-4.13.yaml | 2 +- .../openshift/e2e/aws/capi/OWNERS | 19 +++++++++++++++++ ...nshift-e2e-aws-capi-workflow.metadata.json | 21 +++++++++++++++++++ .../capi/openshift-e2e-aws-capi-workflow.yaml | 16 ++++++++++++++ ...ift-oc-wait-for-stable-cluster-commands.sh | 5 +++++ 14 files changed, 73 insertions(+), 12 deletions(-) create mode 100644 ci-operator/step-registry/openshift/e2e/aws/capi/OWNERS create mode 100644 ci-operator/step-registry/openshift/e2e/aws/capi/openshift-e2e-aws-capi-workflow.metadata.json create mode 100644 ci-operator/step-registry/openshift/e2e/aws/capi/openshift-e2e-aws-capi-workflow.yaml diff --git a/ci-operator/config/openshift-priv/cluster-api-operator/openshift-priv-cluster-api-operator-release-4.13.yaml b/ci-operator/config/openshift-priv/cluster-api-operator/openshift-priv-cluster-api-operator-release-4.13.yaml index 64a8fd385dbea..95273fb6ac28c 100644 --- a/ci-operator/config/openshift-priv/cluster-api-operator/openshift-priv-cluster-api-operator-release-4.13.yaml +++ b/ci-operator/config/openshift-priv/cluster-api-operator/openshift-priv-cluster-api-operator-release-4.13.yaml @@ -46,7 +46,7 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-techpreview-post-install + workflow: openshift-e2e-aws-capi - as: e2e-gcp-ovn-techpreview skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: diff --git a/ci-operator/config/openshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-release-4.11.yaml b/ci-operator/config/openshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-release-4.11.yaml index bb56361fdb646..d94f777982f40 100644 --- a/ci-operator/config/openshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-release-4.11.yaml +++ b/ci-operator/config/openshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-release-4.11.yaml @@ -61,7 +61,7 @@ tests: - as: e2e-aws-techpreview steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-techpreview-post-install + workflow: openshift-e2e-aws-capi - as: e2e-aws-capi-techpreview steps: cluster_profile: openshift-org-aws @@ -72,7 +72,7 @@ tests: resources: requests: cpu: 100m - workflow: openshift-e2e-aws-techpreview-post-install + workflow: openshift-e2e-aws-capi - always_run: false as: e2e-gcp-techpreview optional: true diff --git a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.11.yaml b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.11.yaml index c140828268519..ed07691c1bd3d 100644 --- a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.11.yaml +++ b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.11.yaml @@ -92,7 +92,7 @@ tests: - as: e2e-aws-techpreview-post-install steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-techpreview-post-install + workflow: openshift-e2e-aws-capi zz_generated_metadata: branch: release-4.11 org: openshift-priv diff --git a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.12.yaml b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.12.yaml index 75008d0c4d427..613c16452865d 100644 --- a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.12.yaml +++ b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.12.yaml @@ -86,7 +86,7 @@ tests: - as: e2e-aws-techpreview-post-install steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-techpreview-post-install + workflow: openshift-e2e-aws-capi zz_generated_metadata: branch: release-4.12 org: openshift-priv diff --git a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.13.yaml b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.13.yaml index 4f3b8c21ba166..b90821edc2725 100644 --- a/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.13.yaml +++ b/ci-operator/config/openshift-priv/cluster-machine-approver/openshift-priv-cluster-machine-approver-release-4.13.yaml @@ -90,7 +90,7 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-techpreview-post-install + workflow: openshift-e2e-aws-capi zz_generated_metadata: branch: release-4.13 org: openshift-priv diff --git a/ci-operator/config/openshift/cluster-api-operator/openshift-cluster-api-operator-release-4.13.yaml b/ci-operator/config/openshift/cluster-api-operator/openshift-cluster-api-operator-release-4.13.yaml index 41b81c45c1e3c..63f7697e638e0 100644 --- a/ci-operator/config/openshift/cluster-api-operator/openshift-cluster-api-operator-release-4.13.yaml +++ b/ci-operator/config/openshift/cluster-api-operator/openshift-cluster-api-operator-release-4.13.yaml @@ -46,7 +46,7 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-techpreview-post-install + workflow: openshift-e2e-aws-capi - as: e2e-gcp-ovn-techpreview skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: diff --git a/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.11.yaml b/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.11.yaml index 8f6695d4ffbed..34260cbd44a60 100644 --- a/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.11.yaml +++ b/ci-operator/config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.11.yaml @@ -60,7 +60,7 @@ tests: - as: e2e-aws-techpreview steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-techpreview-post-install + workflow: openshift-e2e-aws-capi - as: e2e-aws-capi-techpreview steps: cluster_profile: openshift-org-aws @@ -71,7 +71,7 @@ tests: resources: requests: cpu: 100m - workflow: openshift-e2e-aws-techpreview-post-install + workflow: openshift-e2e-aws-capi - always_run: false as: e2e-gcp-techpreview optional: true diff --git a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.11.yaml b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.11.yaml index 0d995ff2f110f..4a7dda7ed5503 100644 --- a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.11.yaml +++ b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.11.yaml @@ -91,7 +91,7 @@ tests: - as: e2e-aws-techpreview-post-install steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-techpreview-post-install + workflow: openshift-e2e-aws-capi zz_generated_metadata: branch: release-4.11 org: openshift diff --git a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.12.yaml b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.12.yaml index 4b978c2d75304..9c5edf13a52e0 100644 --- a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.12.yaml +++ b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.12.yaml @@ -85,7 +85,7 @@ tests: - as: e2e-aws-techpreview-post-install steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-techpreview-post-install + workflow: openshift-e2e-aws-capi zz_generated_metadata: branch: release-4.12 org: openshift diff --git a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.13.yaml b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.13.yaml index 7a06d5bf7019c..f5fd53774c617 100644 --- a/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.13.yaml +++ b/ci-operator/config/openshift/cluster-machine-approver/openshift-cluster-machine-approver-release-4.13.yaml @@ -89,7 +89,7 @@ tests: skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ steps: cluster_profile: openshift-org-aws - workflow: openshift-e2e-aws-techpreview-post-install + workflow: openshift-e2e-aws-capi zz_generated_metadata: branch: release-4.13 org: openshift diff --git a/ci-operator/step-registry/openshift/e2e/aws/capi/OWNERS b/ci-operator/step-registry/openshift/e2e/aws/capi/OWNERS new file mode 100644 index 0000000000000..2b2898d8b2e07 --- /dev/null +++ b/ci-operator/step-registry/openshift/e2e/aws/capi/OWNERS @@ -0,0 +1,19 @@ +# DO NOT EDIT; this file is auto-generated using https://github.com/openshift/ci-tools. +# See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md + +approvers: +- alexander-demichev +- elmiko +- fedosin +- joelspeed +- lobziik +- damdo + +options: {} +reviewers: +- alexander-demichev +- elmiko +- fedosin +- joelspeed +- lobziik +- damdo diff --git a/ci-operator/step-registry/openshift/e2e/aws/capi/openshift-e2e-aws-capi-workflow.metadata.json b/ci-operator/step-registry/openshift/e2e/aws/capi/openshift-e2e-aws-capi-workflow.metadata.json new file mode 100644 index 0000000000000..15a23d0f72875 --- /dev/null +++ b/ci-operator/step-registry/openshift/e2e/aws/capi/openshift-e2e-aws-capi-workflow.metadata.json @@ -0,0 +1,21 @@ +{ + "path": "openshift/e2e/aws/capi/openshift-e2e-aws-capi-workflow.yaml", + "owners": { + "approvers": [ + "alexander-demichev", + "elmiko", + "fedosin", + "joelspeed", + "lobziik", + "damdo" + ], + "reviewers": [ + "alexander-demichev", + "elmiko", + "fedosin", + "joelspeed", + "lobziik", + "damdo" + ] + } +} \ No newline at end of file diff --git a/ci-operator/step-registry/openshift/e2e/aws/capi/openshift-e2e-aws-capi-workflow.yaml b/ci-operator/step-registry/openshift/e2e/aws/capi/openshift-e2e-aws-capi-workflow.yaml new file mode 100644 index 0000000000000..cc6ead0356240 --- /dev/null +++ b/ci-operator/step-registry/openshift/e2e/aws/capi/openshift-e2e-aws-capi-workflow.yaml @@ -0,0 +1,16 @@ +workflow: + as: openshift-e2e-aws-capi + steps: + pre: + - ref: ipi-conf + - ref: ipi-conf-telemetry + - ref: ipi-conf-aws + - chain: ipi-install + - ref: capi-conf-apply-feature-gate + test: + - ref: openshift-e2e-test + post: + - chain: gather-core-dump + - chain: ipi-aws-post + documentation: |- + The Openshift E2E AWS workflow for test Cluster API integration. diff --git a/ci-operator/step-registry/openshift/oc/wait-for-stable-cluster/openshift-oc-wait-for-stable-cluster-commands.sh b/ci-operator/step-registry/openshift/oc/wait-for-stable-cluster/openshift-oc-wait-for-stable-cluster-commands.sh index f8c4c9dbf7dd0..60042a837aec6 100755 --- a/ci-operator/step-registry/openshift/oc/wait-for-stable-cluster/openshift-oc-wait-for-stable-cluster-commands.sh +++ b/ci-operator/step-registry/openshift/oc/wait-for-stable-cluster/openshift-oc-wait-for-stable-cluster-commands.sh @@ -6,4 +6,9 @@ if test -f "${SHARED_DIR}/proxy-conf.sh"; then source "${SHARED_DIR}/proxy-conf.sh" fi +if ! oc adm wait-for-stable-cluster --help &>/dev/null; then + echo "oc adm wait-for-stable-cluster is not available in this release" + exit 1 +fi + oc adm wait-for-stable-cluster --minimum-stable-period="${MINIMUM_STABLE_PERIOD}" --timeout="${TIMEOUT}"