From 1a71a9af46397f12f4a563d660cf3bb9d82e0eab Mon Sep 17 00:00:00 2001 From: timflannagan Date: Tue, 12 Apr 2022 13:11:09 -0400 Subject: [PATCH] ci-operator: Rebalance OLM's e2e-upgrade 4.11+ jobs to aws Signed-off-by: timflannagan --- .../openshift-operator-framework-olm-master.yaml | 4 ++-- .../openshift-operator-framework-olm-release-4.11.yaml | 4 ++-- .../openshift-operator-framework-olm-release-4.12.yaml | 4 ++-- .../openshift-operator-framework-olm-master-presubmits.yaml | 6 +++--- ...hift-operator-framework-olm-release-4.11-presubmits.yaml | 6 +++--- ...hift-operator-framework-olm-release-4.12-presubmits.yaml | 6 +++--- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-master.yaml b/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-master.yaml index 200cd714d3244..da8dfa7a3e9a8 100755 --- a/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-master.yaml +++ b/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-master.yaml @@ -117,8 +117,8 @@ tests: workflow: ipi-gcp - as: e2e-upgrade steps: - cluster_profile: azure4 - workflow: openshift-upgrade-azure + cluster_profile: aws + workflow: openshift-upgrade-aws zz_generated_metadata: branch: master org: openshift diff --git a/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.11.yaml b/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.11.yaml index 6ecec23fef254..ece8f1df3ae9c 100644 --- a/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.11.yaml +++ b/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.11.yaml @@ -118,8 +118,8 @@ tests: workflow: ipi-gcp - as: e2e-upgrade steps: - cluster_profile: azure4 - workflow: openshift-upgrade-azure + cluster_profile: aws + workflow: openshift-upgrade-aws zz_generated_metadata: branch: release-4.11 org: openshift diff --git a/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.12.yaml b/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.12.yaml index bca26f3a85f94..2574b88ecd8fc 100644 --- a/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.12.yaml +++ b/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.12.yaml @@ -117,8 +117,8 @@ tests: workflow: ipi-gcp - as: e2e-upgrade steps: - cluster_profile: azure4 - workflow: openshift-upgrade-azure + cluster_profile: aws + workflow: openshift-upgrade-aws zz_generated_metadata: branch: release-4.12 org: openshift diff --git a/ci-operator/jobs/openshift/operator-framework-olm/openshift-operator-framework-olm-master-presubmits.yaml b/ci-operator/jobs/openshift/operator-framework-olm/openshift-operator-framework-olm-master-presubmits.yaml index aad05197ab995..77bc3af956070 100644 --- a/ci-operator/jobs/openshift/operator-framework-olm/openshift-operator-framework-olm-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/operator-framework-olm/openshift-operator-framework-olm-master-presubmits.yaml @@ -314,8 +314,8 @@ presubmits: context: ci/prow/e2e-upgrade decorate: true labels: - ci-operator.openshift.io/cloud: azure4 - ci-operator.openshift.io/cloud-cluster-profile: azure4 + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-operator-framework-olm-master-e2e-upgrade @@ -369,7 +369,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-azure4 + secretName: cluster-secrets-aws - name: pull-secret secret: secretName: registry-pull-credentials diff --git a/ci-operator/jobs/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.11-presubmits.yaml b/ci-operator/jobs/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.11-presubmits.yaml index c5a65a8adcd7b..50b1246c402ab 100644 --- a/ci-operator/jobs/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.11-presubmits.yaml +++ b/ci-operator/jobs/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.11-presubmits.yaml @@ -314,8 +314,8 @@ presubmits: context: ci/prow/e2e-upgrade decorate: true labels: - ci-operator.openshift.io/cloud: azure4 - ci-operator.openshift.io/cloud-cluster-profile: azure4 + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-operator-framework-olm-release-4.11-e2e-upgrade @@ -369,7 +369,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-azure4 + secretName: cluster-secrets-aws - name: pull-secret secret: secretName: registry-pull-credentials diff --git a/ci-operator/jobs/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.12-presubmits.yaml index 0a6ca299a8a98..054fb86a25ae1 100644 --- a/ci-operator/jobs/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.12-presubmits.yaml +++ b/ci-operator/jobs/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.12-presubmits.yaml @@ -314,8 +314,8 @@ presubmits: context: ci/prow/e2e-upgrade decorate: true labels: - ci-operator.openshift.io/cloud: azure4 - ci-operator.openshift.io/cloud-cluster-profile: azure4 + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-operator-framework-olm-release-4.12-e2e-upgrade @@ -369,7 +369,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-azure4 + secretName: cluster-secrets-aws - name: pull-secret secret: secretName: registry-pull-credentials