From cb43923532b47bc2bb324f88bf5fbdf53681ba7b Mon Sep 17 00:00:00 2001 From: Malay Kumar Parida Date: Wed, 21 Feb 2024 12:26:12 +0530 Subject: [PATCH] Switch to odf-aws cluster profile inside red-hat-storage org (#48750) * Delete ci-operator config for mcg-osd-deployer & mcg-ms-console repo These 2 repos are unreleased product & have been long discontinued. There tests are anyways failing without the cluster profile change so removing them is prefered. Signed-off-by: Malay Kumar Parida * Switch to odf-aws cluster profile for ocs-operator repo Signed-off-by: Malay Kumar Parida * Switch to odf-aws cluster profile for odf-console repo Signed-off-by: Malay Kumar Parida * Switch to odf-aws cluster profile for odf-multicluster-orchestrator repo Signed-off-by: Malay Kumar Parida * Switch to odf-aws cluster profile for odf-operator repo Signed-off-by: Malay Kumar Parida * Add make update changes Signed-off-by: Malay Kumar Parida --------- Signed-off-by: Malay Kumar Parida --- .../red-hat-storage/mcg-ms-console/OWNERS | 15 -- ...red-hat-storage-mcg-ms-console-master.yaml | 79 ------- .../red-hat-storage/mcg-osd-deployer/OWNERS | 13 -- ...red-hat-storage-mcg-osd-deployer-main.yaml | 47 ----- .../red-hat-storage-ocs-operator-main.yaml | 6 +- ...hat-storage-ocs-operator-release-4.10.yaml | 7 +- ...hat-storage-ocs-operator-release-4.11.yaml | 7 +- ...hat-storage-ocs-operator-release-4.12.yaml | 5 +- ...hat-storage-ocs-operator-release-4.13.yaml | 5 +- ...hat-storage-ocs-operator-release-4.14.yaml | 6 +- ...hat-storage-ocs-operator-release-4.15.yaml | 6 +- ...-hat-storage-ocs-operator-release-4.2.yaml | 8 +- ...-hat-storage-ocs-operator-release-4.3.yaml | 8 +- ...-hat-storage-ocs-operator-release-4.4.yaml | 8 +- ...-hat-storage-ocs-operator-release-4.5.yaml | 8 +- ...-hat-storage-ocs-operator-release-4.6.yaml | 7 +- ...-hat-storage-ocs-operator-release-4.7.yaml | 7 +- ...-hat-storage-ocs-operator-release-4.8.yaml | 10 +- ...-hat-storage-ocs-operator-release-4.9.yaml | 10 +- .../red-hat-storage-odf-console-master.yaml | 3 +- ...-hat-storage-odf-console-release-4.11.yaml | 3 +- ...-hat-storage-odf-console-release-4.12.yaml | 5 +- ...-hat-storage-odf-console-release-4.13.yaml | 5 +- ...-hat-storage-odf-console-release-4.14.yaml | 3 +- ...ge-odf-multicluster-orchestrator-main.yaml | 4 +- ...ulticluster-orchestrator-release-4.10.yaml | 4 +- ...ulticluster-orchestrator-release-4.11.yaml | 4 +- ...ulticluster-orchestrator-release-4.12.yaml | 4 +- ...ulticluster-orchestrator-release-4.13.yaml | 4 +- ...ulticluster-orchestrator-release-4.14.yaml | 4 +- ...ulticluster-orchestrator-release-4.15.yaml | 4 +- ...ulticluster-orchestrator-release-4.16.yaml | 4 +- ...ulticluster-orchestrator-release-4.17.yaml | 4 +- ...multicluster-orchestrator-release-4.9.yaml | 4 +- .../red-hat-storage-odf-operator-main.yaml | 4 +- ...hat-storage-odf-operator-release-4.10.yaml | 3 +- ...hat-storage-odf-operator-release-4.11.yaml | 3 +- ...hat-storage-odf-operator-release-4.12.yaml | 4 +- ...hat-storage-odf-operator-release-4.13.yaml | 4 +- ...hat-storage-odf-operator-release-4.14.yaml | 4 +- ...hat-storage-odf-operator-release-4.15.yaml | 4 +- ...-hat-storage-odf-operator-release-4.9.yaml | 3 +- .../red-hat-storage/mcg-ms-console/OWNERS | 15 -- ...rage-mcg-ms-console-master-presubmits.yaml | 199 ------------------ .../red-hat-storage/mcg-osd-deployer/OWNERS | 13 -- ...rage-mcg-osd-deployer-main-presubmits.yaml | 148 ------------- ...-storage-ocs-operator-main-presubmits.yaml | 4 +- ...-ocs-operator-release-4.10-presubmits.yaml | 8 +- ...-ocs-operator-release-4.11-presubmits.yaml | 8 +- ...-ocs-operator-release-4.12-presubmits.yaml | 4 +- ...-ocs-operator-release-4.13-presubmits.yaml | 4 +- ...-ocs-operator-release-4.14-presubmits.yaml | 4 +- ...-ocs-operator-release-4.15-presubmits.yaml | 4 +- ...e-ocs-operator-release-4.2-presubmits.yaml | 8 +- ...e-ocs-operator-release-4.3-presubmits.yaml | 8 +- ...e-ocs-operator-release-4.4-presubmits.yaml | 8 +- ...e-ocs-operator-release-4.5-presubmits.yaml | 8 +- ...e-ocs-operator-release-4.6-presubmits.yaml | 8 +- ...e-ocs-operator-release-4.7-presubmits.yaml | 8 +- ...ge-ocs-operator-release-4.8-periodics.yaml | 4 +- ...e-ocs-operator-release-4.8-presubmits.yaml | 8 +- ...ge-ocs-operator-release-4.9-periodics.yaml | 4 +- ...e-ocs-operator-release-4.9-presubmits.yaml | 8 +- ...storage-odf-console-master-presubmits.yaml | 4 +- ...e-odf-console-release-4.11-presubmits.yaml | 4 +- ...e-odf-console-release-4.12-presubmits.yaml | 4 +- ...e-odf-console-release-4.13-presubmits.yaml | 4 +- ...e-odf-console-release-4.14-presubmits.yaml | 4 +- ...icluster-orchestrator-main-presubmits.yaml | 4 +- ...-orchestrator-release-4.10-presubmits.yaml | 4 +- ...-orchestrator-release-4.11-presubmits.yaml | 4 +- ...-orchestrator-release-4.12-presubmits.yaml | 4 +- ...-orchestrator-release-4.13-presubmits.yaml | 4 +- ...-orchestrator-release-4.14-presubmits.yaml | 4 +- ...-orchestrator-release-4.15-presubmits.yaml | 4 +- ...-orchestrator-release-4.16-presubmits.yaml | 4 +- ...-orchestrator-release-4.17-presubmits.yaml | 4 +- ...r-orchestrator-release-4.9-presubmits.yaml | 4 +- ...-storage-odf-operator-main-presubmits.yaml | 4 +- ...-odf-operator-release-4.10-presubmits.yaml | 4 +- ...-odf-operator-release-4.11-presubmits.yaml | 4 +- ...-odf-operator-release-4.12-presubmits.yaml | 4 +- ...-odf-operator-release-4.13-presubmits.yaml | 4 +- ...-odf-operator-release-4.14-presubmits.yaml | 4 +- ...-odf-operator-release-4.15-presubmits.yaml | 4 +- ...e-odf-operator-release-4.9-presubmits.yaml | 4 +- 86 files changed, 244 insertions(+), 681 deletions(-) delete mode 100644 ci-operator/config/red-hat-storage/mcg-ms-console/OWNERS delete mode 100644 ci-operator/config/red-hat-storage/mcg-ms-console/red-hat-storage-mcg-ms-console-master.yaml delete mode 100644 ci-operator/config/red-hat-storage/mcg-osd-deployer/OWNERS delete mode 100644 ci-operator/config/red-hat-storage/mcg-osd-deployer/red-hat-storage-mcg-osd-deployer-main.yaml delete mode 100644 ci-operator/jobs/red-hat-storage/mcg-ms-console/OWNERS delete mode 100644 ci-operator/jobs/red-hat-storage/mcg-ms-console/red-hat-storage-mcg-ms-console-master-presubmits.yaml delete mode 100644 ci-operator/jobs/red-hat-storage/mcg-osd-deployer/OWNERS delete mode 100644 ci-operator/jobs/red-hat-storage/mcg-osd-deployer/red-hat-storage-mcg-osd-deployer-main-presubmits.yaml diff --git a/ci-operator/config/red-hat-storage/mcg-ms-console/OWNERS b/ci-operator/config/red-hat-storage/mcg-ms-console/OWNERS deleted file mode 100644 index c0ba3ed273c7..000000000000 --- a/ci-operator/config/red-hat-storage/mcg-ms-console/OWNERS +++ /dev/null @@ -1,15 +0,0 @@ -# DO NOT EDIT; this file is auto-generated using https://github.com/openshift/ci-tools. -# Fetched from https://github.com/red-hat-storage/mcg-ms-console root OWNERS -# If the repo had OWNERS_ALIASES then the aliases were expanded -# Logins who are not members of 'openshift' organization were filtered out -# See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md - -approvers: -- bipuladh -- cloudbehl -- sanjalkatiyar -options: {} -reviewers: -- bipuladh -- cloudbehl -- sanjalkatiyar diff --git a/ci-operator/config/red-hat-storage/mcg-ms-console/red-hat-storage-mcg-ms-console-master.yaml b/ci-operator/config/red-hat-storage/mcg-ms-console/red-hat-storage-mcg-ms-console-master.yaml deleted file mode 100644 index c54a8842b661..000000000000 --- a/ci-operator/config/red-hat-storage/mcg-ms-console/red-hat-storage-mcg-ms-console-master.yaml +++ /dev/null @@ -1,79 +0,0 @@ -base_images: - base: - name: release - namespace: openshift - tag: tectonic-console-builder-v23 -build_root: - image_stream_tag: - name: release - namespace: openshift - tag: tectonic-console-builder-v23 -images: -- dockerfile_path: Dockerfile.ci - inputs: - base: - as: - - node:15 - to: mcg-ms-console -releases: - initial: - integration: - name: "4.10" - namespace: ocp - latest: - integration: - include_built_images: true - name: "4.10" - namespace: ocp -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 100m - memory: 200Mi -tests: -- as: lint - steps: - test: - - as: lint - commands: yarn install && yarn run lint - from: src - resources: - requests: - cpu: 100m - memory: 200Mi -- as: mcg-ms-console-e2e-aws - steps: - cluster_profile: aws - env: - COMPUTE_NODE_TYPE: m4.2xlarge - ZONES_COUNT: "1" - test: - - as: tests - cli: latest - commands: | - export AWS_ACCESS_KEY_ID="$(cat /etc/mcg-ms-console-e2e-credentials/aws-access-key-id)" - export AWS_SECRET_ACCESS_KEY="$(cat /etc/mcg-ms-console-e2e-credentials/aws-secret-access-key)" - - ./prow.sh ${MCG_MS_CONSOLE_IMG_PULL_SPEC} - credentials: - - mount_path: /var/run/operator-secret - name: operator-secret - namespace: test-credentials - - mount_path: /etc/mcg-ms-console-e2e-credentials - name: mcg-ms-console-e2e-credentials - namespace: test-credentials - dependencies: - - env: MCG_MS_CONSOLE_IMG_PULL_SPEC - name: mcg-ms-console - from: src - resources: - requests: - cpu: 100m - memory: 200Mi - workflow: ipi-aws -zz_generated_metadata: - branch: master - org: red-hat-storage - repo: mcg-ms-console diff --git a/ci-operator/config/red-hat-storage/mcg-osd-deployer/OWNERS b/ci-operator/config/red-hat-storage/mcg-osd-deployer/OWNERS deleted file mode 100644 index 56e098ef4987..000000000000 --- a/ci-operator/config/red-hat-storage/mcg-osd-deployer/OWNERS +++ /dev/null @@ -1,13 +0,0 @@ -# DO NOT EDIT; this file is auto-generated using https://github.com/openshift/ci-tools. -# Fetched from https://github.com/red-hat-storage/mcg-osd-deployer root OWNERS -# If the repo had OWNERS_ALIASES then the aliases were expanded -# Logins who are not members of 'openshift' organization were filtered out -# See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md - -approvers: -- naveenpaul1 -- rexagod -options: {} -reviewers: -- naveenpaul1 -- rexagod diff --git a/ci-operator/config/red-hat-storage/mcg-osd-deployer/red-hat-storage-mcg-osd-deployer-main.yaml b/ci-operator/config/red-hat-storage/mcg-osd-deployer/red-hat-storage-mcg-osd-deployer-main.yaml deleted file mode 100644 index 16701da43b80..000000000000 --- a/ci-operator/config/red-hat-storage/mcg-osd-deployer/red-hat-storage-mcg-osd-deployer-main.yaml +++ /dev/null @@ -1,47 +0,0 @@ -binary_build_commands: make build -build_root: - image_stream_tag: - name: release - namespace: openshift - tag: golang-1.17 -promotion: - to: - - name: "4.9" - namespace: ocp -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 100m - memory: 200Mi -tag_specification: - name: "4.9" - namespace: ocp -tests: -- as: test-suite - steps: - cluster_profile: aws - test: - - as: test-suite-aws - commands: make test - from: src - resources: - requests: - cpu: 100m - memory: 200Mi -- as: lint - steps: - cluster_profile: aws - test: - - as: lint-aws - commands: USE_EXISTING_CLUSTER=true make lint - from: src - resources: - requests: - cpu: 100m - memory: 200Mi -zz_generated_metadata: - branch: main - org: red-hat-storage - repo: mcg-osd-deployer diff --git a/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-main.yaml b/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-main.yaml index f2e7b982a785..80c8ced2e9d9 100644 --- a/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-main.yaml +++ b/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-main.yaml @@ -38,7 +38,11 @@ resources: tests: - as: ocs-operator-bundle-e2e-aws steps: - cluster_profile: aws + cluster_profile: odf-aws + env: + BASE_DOMAIN: makestoragegreatagain.com + COMPUTE_NODE_TYPE: m5.2xlarge + ZONES_COUNT: "3" test: - as: e2e-test cli: latest diff --git a/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.10.yaml b/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.10.yaml index ab90a4a95d2d..6ad0cefde310 100644 --- a/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.10.yaml +++ b/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.10.yaml @@ -85,12 +85,13 @@ tests: from: src - as: ocs-operator-bundle-e2e-aws steps: - cluster_profile: aws + cluster_profile: odf-aws dependencies: CATALOG_FULL_IMAGE_NAME: ocs-registry MUST_GATHER_FULL_IMAGE_NAME: ocs-must-gather OO_INDEX: ci-index-ocs-operator-bundle env: + BASE_DOMAIN: makestoragegreatagain.com OCP_MUST_GATHER_DIR: ${ARTIFACT_DIR}/ocp-must-gather OCS_MUST_GATHER_DIR: ${ARTIFACT_DIR}/ocs-must-gather OO_CHANNEL: alpha @@ -132,7 +133,9 @@ tests: - as: red-hat-storage-ocs-ci-e2e-aws optional: true steps: - cluster_profile: aws + cluster_profile: odf-aws + env: + BASE_DOMAIN: makestoragegreatagain.com test: - as: test cli: latest diff --git a/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.11.yaml b/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.11.yaml index 393e9d3adeca..f3728ab11d06 100644 --- a/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.11.yaml +++ b/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.11.yaml @@ -81,12 +81,13 @@ tests: from: src - as: ocs-operator-bundle-e2e-aws steps: - cluster_profile: aws + cluster_profile: odf-aws dependencies: CATALOG_FULL_IMAGE_NAME: ocs-registry MUST_GATHER_FULL_IMAGE_NAME: ocs-must-gather OO_INDEX: ci-index-ocs-operator-bundle env: + BASE_DOMAIN: makestoragegreatagain.com OCP_MUST_GATHER_DIR: ${ARTIFACT_DIR}/ocp-must-gather OCS_MUST_GATHER_DIR: ${ARTIFACT_DIR}/ocs-must-gather OO_CHANNEL: alpha @@ -128,7 +129,9 @@ tests: - as: red-hat-storage-ocs-ci-e2e-aws optional: true steps: - cluster_profile: aws + cluster_profile: odf-aws + env: + BASE_DOMAIN: makestoragegreatagain.com test: - as: test cli: latest diff --git a/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.12.yaml b/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.12.yaml index f5b9b4661e34..761431bdd5b9 100644 --- a/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.12.yaml +++ b/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.12.yaml @@ -76,18 +76,21 @@ tests: from: src - as: ocs-operator-bundle-e2e-aws steps: - cluster_profile: aws + cluster_profile: odf-aws dependencies: CATALOG_FULL_IMAGE_NAME: ocs-registry MUST_GATHER_FULL_IMAGE_NAME: ocs-must-gather OO_INDEX: ci-index-ocs-operator-bundle env: + BASE_DOMAIN: makestoragegreatagain.com + COMPUTE_NODE_TYPE: m5.2xlarge OCP_MUST_GATHER_DIR: ${ARTIFACT_DIR}/ocp-must-gather OCS_MUST_GATHER_DIR: ${ARTIFACT_DIR}/ocs-must-gather OO_CHANNEL: alpha OO_INSTALL_NAMESPACE: openshift-storage OO_PACKAGE: ocs-operator OO_TARGET_NAMESPACES: '!install' + ZONES_COUNT: "3" post: - as: ocs-must-gather cli: latest diff --git a/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.13.yaml b/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.13.yaml index d473b5546305..fa7378392f54 100644 --- a/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.13.yaml +++ b/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.13.yaml @@ -68,17 +68,20 @@ tests: from: src - as: ocs-operator-bundle-e2e-aws steps: - cluster_profile: aws + cluster_profile: odf-aws dependencies: CATALOG_FULL_IMAGE_NAME: ocs-registry OO_INDEX: ci-index-ocs-operator-bundle env: + BASE_DOMAIN: makestoragegreatagain.com + COMPUTE_NODE_TYPE: m5.2xlarge OCP_MUST_GATHER_DIR: ${ARTIFACT_DIR}/ocp-must-gather OCS_MUST_GATHER_DIR: ${ARTIFACT_DIR}/ocs-must-gather OO_CHANNEL: alpha OO_INSTALL_NAMESPACE: openshift-storage OO_PACKAGE: ocs-operator OO_TARGET_NAMESPACES: '!install' + ZONES_COUNT: "3" post: - as: ocs-must-gather cli: latest diff --git a/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.14.yaml b/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.14.yaml index 464323d3abc8..4e6d71f388ce 100644 --- a/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.14.yaml +++ b/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.14.yaml @@ -42,7 +42,11 @@ tests: from: src - as: ocs-operator-bundle-e2e-aws steps: - cluster_profile: aws + cluster_profile: odf-aws + env: + BASE_DOMAIN: makestoragegreatagain.com + COMPUTE_NODE_TYPE: m5.2xlarge + ZONES_COUNT: "3" test: - as: e2e-test cli: latest diff --git a/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.15.yaml b/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.15.yaml index f052b30e9095..37f719179aef 100644 --- a/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.15.yaml +++ b/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.15.yaml @@ -37,7 +37,11 @@ resources: tests: - as: ocs-operator-bundle-e2e-aws steps: - cluster_profile: aws + cluster_profile: odf-aws + env: + BASE_DOMAIN: makestoragegreatagain.com + COMPUTE_NODE_TYPE: m5.2xlarge + ZONES_COUNT: "3" test: - as: e2e-test cli: latest diff --git a/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.2.yaml b/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.2.yaml index a6b4bab5edea..bd77318dc3f7 100644 --- a/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.2.yaml +++ b/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.2.yaml @@ -91,7 +91,9 @@ tests: from: src - as: ocs-operator-e2e-aws steps: - cluster_profile: aws + cluster_profile: odf-aws + env: + BASE_DOMAIN: makestoragegreatagain.com test: - as: test cli: latest @@ -104,7 +106,9 @@ tests: workflow: ipi-aws - as: red-hat-storage-ocs-ci-e2e-aws steps: - cluster_profile: aws + cluster_profile: odf-aws + env: + BASE_DOMAIN: makestoragegreatagain.com test: - as: test cli: latest diff --git a/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.3.yaml b/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.3.yaml index ba8ab13a3de5..1dc4037ae186 100644 --- a/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.3.yaml +++ b/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.3.yaml @@ -92,7 +92,9 @@ tests: from: src - as: ocs-operator-e2e-aws steps: - cluster_profile: aws + cluster_profile: odf-aws + env: + BASE_DOMAIN: makestoragegreatagain.com test: - as: test cli: latest @@ -105,7 +107,9 @@ tests: workflow: ipi-aws - as: red-hat-storage-ocs-ci-e2e-aws steps: - cluster_profile: aws + cluster_profile: odf-aws + env: + BASE_DOMAIN: makestoragegreatagain.com test: - as: test cli: latest diff --git a/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.4.yaml b/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.4.yaml index 893a4ffe9aa6..c007090344a2 100644 --- a/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.4.yaml +++ b/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.4.yaml @@ -91,7 +91,9 @@ tests: from: src - as: ocs-operator-e2e-aws steps: - cluster_profile: aws + cluster_profile: odf-aws + env: + BASE_DOMAIN: makestoragegreatagain.com test: - as: test cli: latest @@ -104,7 +106,9 @@ tests: workflow: ipi-aws - as: red-hat-storage-ocs-ci-e2e-aws steps: - cluster_profile: aws + cluster_profile: odf-aws + env: + BASE_DOMAIN: makestoragegreatagain.com test: - as: test cli: latest diff --git a/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.5.yaml b/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.5.yaml index b6590b083108..4cdb8597bd10 100644 --- a/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.5.yaml +++ b/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.5.yaml @@ -86,7 +86,9 @@ tests: from: src - as: ocs-operator-e2e-aws steps: - cluster_profile: aws + cluster_profile: odf-aws + env: + BASE_DOMAIN: makestoragegreatagain.com test: - as: test cli: latest @@ -99,7 +101,9 @@ tests: workflow: ipi-aws - as: red-hat-storage-ocs-ci-e2e-aws steps: - cluster_profile: aws + cluster_profile: odf-aws + env: + BASE_DOMAIN: makestoragegreatagain.com test: - as: test cli: latest diff --git a/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.6.yaml b/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.6.yaml index d2b011668462..d046bc77232c 100644 --- a/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.6.yaml +++ b/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.6.yaml @@ -107,8 +107,9 @@ tests: from: src - as: ocs-operator-bundle-e2e-aws steps: - cluster_profile: aws + cluster_profile: odf-aws env: + BASE_DOMAIN: makestoragegreatagain.com OO_CHANNEL: alpha OO_INSTALL_NAMESPACE: openshift-storage OO_PACKAGE: ocs-operator @@ -125,7 +126,9 @@ tests: workflow: optional-operators-ci-aws - as: red-hat-storage-ocs-ci-e2e-aws steps: - cluster_profile: aws + cluster_profile: odf-aws + env: + BASE_DOMAIN: makestoragegreatagain.com test: - as: test cli: latest diff --git a/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.7.yaml b/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.7.yaml index 8d6d139850ef..3107c90a145e 100644 --- a/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.7.yaml +++ b/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.7.yaml @@ -106,8 +106,9 @@ tests: from: src - as: ocs-operator-bundle-e2e-aws steps: - cluster_profile: aws + cluster_profile: odf-aws env: + BASE_DOMAIN: makestoragegreatagain.com OO_CHANNEL: alpha OO_INSTALL_NAMESPACE: openshift-storage OO_PACKAGE: ocs-operator @@ -124,7 +125,9 @@ tests: workflow: optional-operators-ci-aws - as: red-hat-storage-ocs-ci-e2e-aws steps: - cluster_profile: aws + cluster_profile: odf-aws + env: + BASE_DOMAIN: makestoragegreatagain.com test: - as: test cli: latest diff --git a/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.8.yaml b/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.8.yaml index 2224a91aeef3..c30160f09af9 100644 --- a/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.8.yaml +++ b/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.8.yaml @@ -102,10 +102,11 @@ tests: from: src - as: ocs-operator-bundle-e2e-aws steps: - cluster_profile: aws + cluster_profile: odf-aws dependencies: OO_INDEX: ci-index-fixed-dependencies env: + BASE_DOMAIN: makestoragegreatagain.com OO_CHANNEL: alpha OO_INSTALL_NAMESPACE: openshift-storage OO_PACKAGE: ocs-operator @@ -135,10 +136,11 @@ tests: - as: ocs-operator-bundle-master-e2e-aws cron: 31 0 14,25 * * steps: - cluster_profile: aws + cluster_profile: odf-aws dependencies: OO_INDEX: ci-index-dev-master-dependencies env: + BASE_DOMAIN: makestoragegreatagain.com OO_CHANNEL: alpha OO_INSTALL_NAMESPACE: openshift-storage OO_PACKAGE: ocs-operator @@ -167,7 +169,9 @@ tests: - as: red-hat-storage-ocs-ci-e2e-aws optional: true steps: - cluster_profile: aws + cluster_profile: odf-aws + env: + BASE_DOMAIN: makestoragegreatagain.com test: - as: test cli: latest diff --git a/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.9.yaml b/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.9.yaml index d36ad1570944..0d5c22991540 100644 --- a/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.9.yaml +++ b/ci-operator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.9.yaml @@ -88,12 +88,13 @@ tests: from: src - as: ocs-operator-bundle-e2e-aws steps: - cluster_profile: aws + cluster_profile: odf-aws dependencies: CATALOG_FULL_IMAGE_NAME: ocs-registry MUST_GATHER_FULL_IMAGE_NAME: ocs-must-gather OO_INDEX: ci-index-fixed-dependencies env: + BASE_DOMAIN: makestoragegreatagain.com OCP_MUST_GATHER_DIR: ${ARTIFACT_DIR}/ocp-must-gather OCS_MUST_GATHER_DIR: ${ARTIFACT_DIR}/ocs-must-gather OO_CHANNEL: alpha @@ -135,10 +136,11 @@ tests: - as: ocs-operator-bundle-master-e2e-aws cron: 59 0 3,27 * * steps: - cluster_profile: aws + cluster_profile: odf-aws dependencies: OO_INDEX: ci-index-dev-master-dependencies env: + BASE_DOMAIN: makestoragegreatagain.com OO_CHANNEL: alpha OO_INSTALL_NAMESPACE: openshift-storage OO_PACKAGE: ocs-operator @@ -167,7 +169,9 @@ tests: - as: red-hat-storage-ocs-ci-e2e-aws optional: true steps: - cluster_profile: aws + cluster_profile: odf-aws + env: + BASE_DOMAIN: makestoragegreatagain.com test: - as: test cli: latest diff --git a/ci-operator/config/red-hat-storage/odf-console/red-hat-storage-odf-console-master.yaml b/ci-operator/config/red-hat-storage/odf-console/red-hat-storage-odf-console-master.yaml index 2f22680ba90c..f2479d9ada92 100644 --- a/ci-operator/config/red-hat-storage/odf-console/red-hat-storage-odf-console-master.yaml +++ b/ci-operator/config/red-hat-storage/odf-console/red-hat-storage-odf-console-master.yaml @@ -28,10 +28,11 @@ tests: - as: odf-console-e2e-aws steps: allow_skip_on_success: true - cluster_profile: aws + cluster_profile: odf-aws dependencies: ODF_CONSOLE_FULL_IMG_NAME: odf-console env: + BASE_DOMAIN: makestoragegreatagain.com COMPUTE_NODE_TYPE: m5.2xlarge ZONES_COUNT: "3" test: diff --git a/ci-operator/config/red-hat-storage/odf-console/red-hat-storage-odf-console-release-4.11.yaml b/ci-operator/config/red-hat-storage/odf-console/red-hat-storage-odf-console-release-4.11.yaml index 1895155a015f..39951ff7d21c 100644 --- a/ci-operator/config/red-hat-storage/odf-console/red-hat-storage-odf-console-release-4.11.yaml +++ b/ci-operator/config/red-hat-storage/odf-console/red-hat-storage-odf-console-release-4.11.yaml @@ -45,10 +45,11 @@ tests: memory: 200Mi - as: odf-console-e2e-aws steps: - cluster_profile: aws + cluster_profile: odf-aws dependencies: ODF_CONSOLE_FULL_IMG_NAME: odf-console env: + BASE_DOMAIN: makestoragegreatagain.com COMPUTE_NODE_TYPE: m4.2xlarge ZONES_COUNT: "1" test: diff --git a/ci-operator/config/red-hat-storage/odf-console/red-hat-storage-odf-console-release-4.12.yaml b/ci-operator/config/red-hat-storage/odf-console/red-hat-storage-odf-console-release-4.12.yaml index cce50e88133f..cadd0a246a91 100644 --- a/ci-operator/config/red-hat-storage/odf-console/red-hat-storage-odf-console-release-4.12.yaml +++ b/ci-operator/config/red-hat-storage/odf-console/red-hat-storage-odf-console-release-4.12.yaml @@ -45,11 +45,12 @@ tests: memory: 200Mi - as: odf-console-e2e-aws steps: - cluster_profile: aws + cluster_profile: odf-aws dependencies: ODF_CONSOLE_FULL_IMG_NAME: odf-console env: - COMPUTE_NODE_TYPE: m4.2xlarge + BASE_DOMAIN: makestoragegreatagain.com + COMPUTE_NODE_TYPE: m5.2xlarge ZONES_COUNT: "3" test: - as: tests diff --git a/ci-operator/config/red-hat-storage/odf-console/red-hat-storage-odf-console-release-4.13.yaml b/ci-operator/config/red-hat-storage/odf-console/red-hat-storage-odf-console-release-4.13.yaml index 1d2ae64c93a7..cff121953178 100644 --- a/ci-operator/config/red-hat-storage/odf-console/red-hat-storage-odf-console-release-4.13.yaml +++ b/ci-operator/config/red-hat-storage/odf-console/red-hat-storage-odf-console-release-4.13.yaml @@ -28,11 +28,12 @@ tests: - as: odf-console-e2e-aws steps: allow_skip_on_success: true - cluster_profile: aws + cluster_profile: odf-aws dependencies: ODF_CONSOLE_FULL_IMG_NAME: odf-console env: - COMPUTE_NODE_TYPE: m4.2xlarge + BASE_DOMAIN: makestoragegreatagain.com + COMPUTE_NODE_TYPE: m5.2xlarge ZONES_COUNT: "3" test: - as: tests diff --git a/ci-operator/config/red-hat-storage/odf-console/red-hat-storage-odf-console-release-4.14.yaml b/ci-operator/config/red-hat-storage/odf-console/red-hat-storage-odf-console-release-4.14.yaml index 4820f709f64a..882a98f3e84c 100644 --- a/ci-operator/config/red-hat-storage/odf-console/red-hat-storage-odf-console-release-4.14.yaml +++ b/ci-operator/config/red-hat-storage/odf-console/red-hat-storage-odf-console-release-4.14.yaml @@ -28,10 +28,11 @@ tests: - as: odf-console-e2e-aws steps: allow_skip_on_success: true - cluster_profile: aws + cluster_profile: odf-aws dependencies: ODF_CONSOLE_FULL_IMG_NAME: odf-console env: + BASE_DOMAIN: makestoragegreatagain.com COMPUTE_NODE_TYPE: m5.2xlarge ZONES_COUNT: "3" test: diff --git a/ci-operator/config/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-main.yaml b/ci-operator/config/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-main.yaml index c64fdd7739e3..3ac9e34b9134 100644 --- a/ci-operator/config/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-main.yaml +++ b/ci-operator/config/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-main.yaml @@ -32,7 +32,9 @@ tests: from: src - as: integration-test steps: - cluster_profile: aws + cluster_profile: odf-aws + env: + BASE_DOMAIN: makestoragegreatagain.com test: - as: integration-test-aws commands: USE_EXISTING_CLUSTER=true make test diff --git a/ci-operator/config/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.10.yaml b/ci-operator/config/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.10.yaml index 09807c446d1a..4a573c1bdb77 100644 --- a/ci-operator/config/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.10.yaml +++ b/ci-operator/config/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.10.yaml @@ -32,7 +32,9 @@ tests: from: src - as: integration-test steps: - cluster_profile: aws + cluster_profile: odf-aws + env: + BASE_DOMAIN: makestoragegreatagain.com test: - as: integration-test-aws commands: USE_EXISTING_CLUSTER=true make test diff --git a/ci-operator/config/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.11.yaml b/ci-operator/config/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.11.yaml index d60fe79452a5..6690ccbc9455 100644 --- a/ci-operator/config/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.11.yaml +++ b/ci-operator/config/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.11.yaml @@ -33,7 +33,9 @@ tests: from: src - as: integration-test steps: - cluster_profile: aws + cluster_profile: odf-aws + env: + BASE_DOMAIN: makestoragegreatagain.com test: - as: integration-test-aws commands: USE_EXISTING_CLUSTER=true make test diff --git a/ci-operator/config/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.12.yaml b/ci-operator/config/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.12.yaml index de4dd91afcf4..0af6b2aec22f 100644 --- a/ci-operator/config/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.12.yaml +++ b/ci-operator/config/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.12.yaml @@ -32,7 +32,9 @@ tests: from: src - as: integration-test steps: - cluster_profile: aws + cluster_profile: odf-aws + env: + BASE_DOMAIN: makestoragegreatagain.com test: - as: integration-test-aws commands: USE_EXISTING_CLUSTER=true make test diff --git a/ci-operator/config/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.13.yaml b/ci-operator/config/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.13.yaml index 5de522411a12..0d559ef94e25 100644 --- a/ci-operator/config/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.13.yaml +++ b/ci-operator/config/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.13.yaml @@ -32,7 +32,9 @@ tests: from: src - as: integration-test steps: - cluster_profile: aws + cluster_profile: odf-aws + env: + BASE_DOMAIN: makestoragegreatagain.com test: - as: integration-test-aws commands: USE_EXISTING_CLUSTER=true make test diff --git a/ci-operator/config/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.14.yaml b/ci-operator/config/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.14.yaml index 1a68a2426deb..4523f7a3de48 100644 --- a/ci-operator/config/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.14.yaml +++ b/ci-operator/config/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.14.yaml @@ -32,7 +32,9 @@ tests: from: src - as: integration-test steps: - cluster_profile: aws + cluster_profile: odf-aws + env: + BASE_DOMAIN: makestoragegreatagain.com test: - as: integration-test-aws commands: USE_EXISTING_CLUSTER=true make test diff --git a/ci-operator/config/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.15.yaml b/ci-operator/config/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.15.yaml index e79ddba23b50..f6eb484c0cfc 100644 --- a/ci-operator/config/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.15.yaml +++ b/ci-operator/config/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.15.yaml @@ -32,7 +32,9 @@ tests: from: src - as: integration-test steps: - cluster_profile: aws + cluster_profile: odf-aws + env: + BASE_DOMAIN: makestoragegreatagain.com test: - as: integration-test-aws commands: USE_EXISTING_CLUSTER=true make test diff --git a/ci-operator/config/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.16.yaml b/ci-operator/config/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.16.yaml index 0714c92cadbf..62140b90d00d 100644 --- a/ci-operator/config/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.16.yaml +++ b/ci-operator/config/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.16.yaml @@ -33,7 +33,9 @@ tests: from: src - as: integration-test steps: - cluster_profile: aws + cluster_profile: odf-aws + env: + BASE_DOMAIN: makestoragegreatagain.com test: - as: integration-test-aws commands: USE_EXISTING_CLUSTER=true make test diff --git a/ci-operator/config/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.17.yaml b/ci-operator/config/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.17.yaml index 4663fa24c1b8..184af051b22c 100644 --- a/ci-operator/config/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.17.yaml +++ b/ci-operator/config/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.17.yaml @@ -32,7 +32,9 @@ tests: from: src - as: integration-test steps: - cluster_profile: aws + cluster_profile: odf-aws + env: + BASE_DOMAIN: makestoragegreatagain.com test: - as: integration-test-aws commands: USE_EXISTING_CLUSTER=true make test diff --git a/ci-operator/config/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.9.yaml b/ci-operator/config/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.9.yaml index acccd573e1ec..d77ba939b718 100644 --- a/ci-operator/config/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.9.yaml +++ b/ci-operator/config/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.9.yaml @@ -32,7 +32,9 @@ tests: from: src - as: integration-test steps: - cluster_profile: aws + cluster_profile: odf-aws + env: + BASE_DOMAIN: makestoragegreatagain.com test: - as: integration-test-aws commands: USE_EXISTING_CLUSTER=true make test diff --git a/ci-operator/config/red-hat-storage/odf-operator/red-hat-storage-odf-operator-main.yaml b/ci-operator/config/red-hat-storage/odf-operator/red-hat-storage-odf-operator-main.yaml index 3b08d5d5fb4c..1ef66b6bbe32 100644 --- a/ci-operator/config/red-hat-storage/odf-operator/red-hat-storage-odf-operator-main.yaml +++ b/ci-operator/config/red-hat-storage/odf-operator/red-hat-storage-odf-operator-main.yaml @@ -34,7 +34,9 @@ resources: tests: - as: odf-operator-e2e-aws steps: - cluster_profile: aws + cluster_profile: odf-aws + env: + BASE_DOMAIN: makestoragegreatagain.com test: - as: unit-tests cli: latest diff --git a/ci-operator/config/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.10.yaml b/ci-operator/config/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.10.yaml index 0ed500c49f63..9aa03042e996 100644 --- a/ci-operator/config/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.10.yaml +++ b/ci-operator/config/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.10.yaml @@ -83,10 +83,11 @@ tests: - as: odf-operator-bundle-e2e-aws optional: true steps: - cluster_profile: aws + cluster_profile: odf-aws dependencies: OO_INDEX: ci-index-odf-operator-static-deps env: + BASE_DOMAIN: makestoragegreatagain.com OO_CHANNEL: alpha OO_INSTALL_NAMESPACE: openshift-storage OO_PACKAGE: odf-operator diff --git a/ci-operator/config/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.11.yaml b/ci-operator/config/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.11.yaml index fe35cc50e022..93ef9ea28bbe 100644 --- a/ci-operator/config/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.11.yaml +++ b/ci-operator/config/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.11.yaml @@ -79,10 +79,11 @@ tests: - as: odf-operator-bundle-e2e-aws optional: true steps: - cluster_profile: aws + cluster_profile: odf-aws dependencies: OO_INDEX: ci-index-odf-operator-static-deps env: + BASE_DOMAIN: makestoragegreatagain.com OO_CHANNEL: alpha OO_INSTALL_NAMESPACE: openshift-storage OO_PACKAGE: odf-operator diff --git a/ci-operator/config/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.12.yaml b/ci-operator/config/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.12.yaml index f635ccd36933..34069c4890c1 100644 --- a/ci-operator/config/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.12.yaml +++ b/ci-operator/config/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.12.yaml @@ -78,7 +78,9 @@ resources: tests: - as: odf-operator-bundle-e2e-aws steps: - cluster_profile: aws + cluster_profile: odf-aws + env: + BASE_DOMAIN: makestoragegreatagain.com test: - as: unit-tests commands: | diff --git a/ci-operator/config/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.13.yaml b/ci-operator/config/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.13.yaml index 9aa029999b6c..02c2ad9a2bec 100644 --- a/ci-operator/config/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.13.yaml +++ b/ci-operator/config/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.13.yaml @@ -34,7 +34,9 @@ resources: tests: - as: odf-operator-e2e-aws steps: - cluster_profile: aws + cluster_profile: odf-aws + env: + BASE_DOMAIN: makestoragegreatagain.com test: - as: unit-tests cli: latest diff --git a/ci-operator/config/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.14.yaml b/ci-operator/config/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.14.yaml index 4d3a811cfc04..17bdba8b198f 100644 --- a/ci-operator/config/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.14.yaml +++ b/ci-operator/config/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.14.yaml @@ -34,7 +34,9 @@ resources: tests: - as: odf-operator-e2e-aws steps: - cluster_profile: aws + cluster_profile: odf-aws + env: + BASE_DOMAIN: makestoragegreatagain.com test: - as: unit-tests cli: latest diff --git a/ci-operator/config/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.15.yaml b/ci-operator/config/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.15.yaml index 9c2ee5506abb..318533018b83 100644 --- a/ci-operator/config/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.15.yaml +++ b/ci-operator/config/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.15.yaml @@ -34,7 +34,9 @@ resources: tests: - as: odf-operator-e2e-aws steps: - cluster_profile: aws + cluster_profile: odf-aws + env: + BASE_DOMAIN: makestoragegreatagain.com test: - as: unit-tests cli: latest diff --git a/ci-operator/config/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.9.yaml b/ci-operator/config/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.9.yaml index dcf9df7599a4..e8e6eb2fd580 100644 --- a/ci-operator/config/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.9.yaml +++ b/ci-operator/config/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.9.yaml @@ -79,10 +79,11 @@ tests: - as: odf-operator-bundle-e2e-aws optional: true steps: - cluster_profile: aws + cluster_profile: odf-aws dependencies: OO_INDEX: ci-index-odf-operator-static-deps env: + BASE_DOMAIN: makestoragegreatagain.com OO_CHANNEL: alpha OO_INSTALL_NAMESPACE: openshift-storage OO_PACKAGE: odf-operator diff --git a/ci-operator/jobs/red-hat-storage/mcg-ms-console/OWNERS b/ci-operator/jobs/red-hat-storage/mcg-ms-console/OWNERS deleted file mode 100644 index c0ba3ed273c7..000000000000 --- a/ci-operator/jobs/red-hat-storage/mcg-ms-console/OWNERS +++ /dev/null @@ -1,15 +0,0 @@ -# DO NOT EDIT; this file is auto-generated using https://github.com/openshift/ci-tools. -# Fetched from https://github.com/red-hat-storage/mcg-ms-console root OWNERS -# If the repo had OWNERS_ALIASES then the aliases were expanded -# Logins who are not members of 'openshift' organization were filtered out -# See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md - -approvers: -- bipuladh -- cloudbehl -- sanjalkatiyar -options: {} -reviewers: -- bipuladh -- cloudbehl -- sanjalkatiyar diff --git a/ci-operator/jobs/red-hat-storage/mcg-ms-console/red-hat-storage-mcg-ms-console-master-presubmits.yaml b/ci-operator/jobs/red-hat-storage/mcg-ms-console/red-hat-storage-mcg-ms-console-master-presubmits.yaml deleted file mode 100644 index e374acf634d2..000000000000 --- a/ci-operator/jobs/red-hat-storage/mcg-ms-console/red-hat-storage-mcg-ms-console-master-presubmits.yaml +++ /dev/null @@ -1,199 +0,0 @@ -presubmits: - red-hat-storage/mcg-ms-console: - - agent: kubernetes - always_run: true - branches: - - ^master$ - - ^master- - cluster: build03 - context: ci/prow/images - decorate: true - decoration_config: - skip_cloning: true - labels: - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-red-hat-storage-mcg-ms-console-master-images - rerun_command: /test images - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --report-credentials-file=/etc/report/credentials - - --target=[images] - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )images,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^master$ - - ^master- - cluster: build03 - context: ci/prow/lint - decorate: true - decoration_config: - skip_cloning: true - labels: - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-red-hat-storage-mcg-ms-console-master-lint - rerun_command: /test lint - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --target=lint - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )lint,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^master$ - - ^master- - cluster: build05 - context: ci/prow/mcg-ms-console-e2e-aws - decorate: true - decoration_config: - skip_cloning: true - labels: - 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-red-hat-storage-mcg-ms-console-master-mcg-ms-console-e2e-aws - rerun_command: /test mcg-ms-console-e2e-aws - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/secrets/ci-pull-credentials - - --secret-dir=/usr/local/mcg-ms-console-e2e-aws-cluster-profile - - --target=mcg-ms-console-e2e-aws - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /secrets/ci-pull-credentials - name: ci-pull-credentials - readOnly: true - - mountPath: /usr/local/mcg-ms-console-e2e-aws-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: ci-pull-credentials - secret: - secretName: ci-pull-credentials - - name: cluster-profile - secret: - secretName: cluster-secrets-aws - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )mcg-ms-console-e2e-aws,?($|\s.*) diff --git a/ci-operator/jobs/red-hat-storage/mcg-osd-deployer/OWNERS b/ci-operator/jobs/red-hat-storage/mcg-osd-deployer/OWNERS deleted file mode 100644 index 56e098ef4987..000000000000 --- a/ci-operator/jobs/red-hat-storage/mcg-osd-deployer/OWNERS +++ /dev/null @@ -1,13 +0,0 @@ -# DO NOT EDIT; this file is auto-generated using https://github.com/openshift/ci-tools. -# Fetched from https://github.com/red-hat-storage/mcg-osd-deployer root OWNERS -# If the repo had OWNERS_ALIASES then the aliases were expanded -# Logins who are not members of 'openshift' organization were filtered out -# See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md - -approvers: -- naveenpaul1 -- rexagod -options: {} -reviewers: -- naveenpaul1 -- rexagod diff --git a/ci-operator/jobs/red-hat-storage/mcg-osd-deployer/red-hat-storage-mcg-osd-deployer-main-presubmits.yaml b/ci-operator/jobs/red-hat-storage/mcg-osd-deployer/red-hat-storage-mcg-osd-deployer-main-presubmits.yaml deleted file mode 100644 index c88a6ee761b4..000000000000 --- a/ci-operator/jobs/red-hat-storage/mcg-osd-deployer/red-hat-storage-mcg-osd-deployer-main-presubmits.yaml +++ /dev/null @@ -1,148 +0,0 @@ -presubmits: - red-hat-storage/mcg-osd-deployer: - - agent: kubernetes - always_run: true - branches: - - ^main$ - - ^main- - cluster: build05 - context: ci/prow/lint - decorate: true - decoration_config: - skip_cloning: true - labels: - 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-red-hat-storage-mcg-osd-deployer-main-lint - rerun_command: /test lint - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/usr/local/lint-cluster-profile - - --target=lint - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /usr/local/lint-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: cluster-profile - secret: - secretName: cluster-secrets-aws - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )lint,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^main$ - - ^main- - cluster: build05 - context: ci/prow/test-suite - decorate: true - decoration_config: - skip_cloning: true - labels: - 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-red-hat-storage-mcg-osd-deployer-main-test-suite - rerun_command: /test test-suite - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --lease-server-credentials-file=/etc/boskos/credentials - - --report-credentials-file=/etc/report/credentials - - --secret-dir=/usr/local/test-suite-cluster-profile - - --target=test-suite - command: - - ci-operator - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/boskos - name: boskos - readOnly: true - - mountPath: /usr/local/test-suite-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - readOnly: true - - mountPath: /secrets/manifest-tool - name: manifest-tool-local-pusher - readOnly: true - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: boskos - secret: - items: - - key: credentials - path: credentials - secretName: boskos-credentials - - name: cluster-profile - secret: - secretName: cluster-secrets-aws - - name: manifest-tool-local-pusher - secret: - secretName: manifest-tool-local-pusher - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )test-suite,?($|\s.*) diff --git a/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-main-presubmits.yaml b/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-main-presubmits.yaml index 44dbb0a6a540..2141068ddfa2 100644 --- a/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-main-presubmits.yaml +++ b/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-main-presubmits.yaml @@ -122,7 +122,7 @@ presubmits: skip_cloning: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-red-hat-storage-ocs-operator-main-ocs-operator-bundle-e2e-aws @@ -179,7 +179,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-odf-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher diff --git a/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.10-presubmits.yaml b/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.10-presubmits.yaml index bfd8670a8b4c..9633c958c10d 100644 --- a/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.10-presubmits.yaml +++ b/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.10-presubmits.yaml @@ -117,7 +117,7 @@ presubmits: decorate: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-red-hat-storage-ocs-operator-release-4.10-ocs-operator-bundle-e2e-aws @@ -174,7 +174,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-odf-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher @@ -248,7 +248,7 @@ presubmits: decorate: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-red-hat-storage-ocs-operator-release-4.10-red-hat-storage-ocs-ci-e2e-aws @@ -306,7 +306,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-odf-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher diff --git a/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.11-presubmits.yaml b/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.11-presubmits.yaml index b06039562c47..d39cbde8151c 100644 --- a/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.11-presubmits.yaml +++ b/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.11-presubmits.yaml @@ -117,7 +117,7 @@ presubmits: decorate: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-red-hat-storage-ocs-operator-release-4.11-ocs-operator-bundle-e2e-aws @@ -174,7 +174,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-odf-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher @@ -248,7 +248,7 @@ presubmits: decorate: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-red-hat-storage-ocs-operator-release-4.11-red-hat-storage-ocs-ci-e2e-aws @@ -306,7 +306,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-odf-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher diff --git a/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.12-presubmits.yaml b/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.12-presubmits.yaml index 7f410985e6a7..5058aa7a66c7 100644 --- a/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.12-presubmits.yaml +++ b/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.12-presubmits.yaml @@ -117,7 +117,7 @@ presubmits: decorate: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-red-hat-storage-ocs-operator-release-4.12-ocs-operator-bundle-e2e-aws @@ -174,7 +174,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-odf-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher diff --git a/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.13-presubmits.yaml b/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.13-presubmits.yaml index c4c71f40a080..49f417d1369b 100644 --- a/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.13-presubmits.yaml +++ b/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.13-presubmits.yaml @@ -117,7 +117,7 @@ presubmits: decorate: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-red-hat-storage-ocs-operator-release-4.13-ocs-operator-bundle-e2e-aws @@ -174,7 +174,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-odf-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher diff --git a/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.14-presubmits.yaml b/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.14-presubmits.yaml index 4391c46a5551..165ef67386c3 100644 --- a/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.14-presubmits.yaml +++ b/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.14-presubmits.yaml @@ -122,7 +122,7 @@ presubmits: skip_cloning: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-red-hat-storage-ocs-operator-release-4.14-ocs-operator-bundle-e2e-aws @@ -179,7 +179,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-odf-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher diff --git a/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.15-presubmits.yaml b/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.15-presubmits.yaml index 29099c7584c7..5333b2b4bf83 100644 --- a/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.15-presubmits.yaml +++ b/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.15-presubmits.yaml @@ -122,7 +122,7 @@ presubmits: skip_cloning: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-red-hat-storage-ocs-operator-release-4.15-ocs-operator-bundle-e2e-aws @@ -179,7 +179,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-odf-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher diff --git a/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.2-presubmits.yaml b/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.2-presubmits.yaml index 2be9c2c986ba..42dfe7ce9c1b 100644 --- a/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.2-presubmits.yaml +++ b/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.2-presubmits.yaml @@ -123,7 +123,7 @@ presubmits: skip_cloning: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-red-hat-storage-ocs-operator-release-4.2-ocs-operator-e2e-aws @@ -180,7 +180,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-odf-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher @@ -203,7 +203,7 @@ presubmits: skip_cloning: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-red-hat-storage-ocs-operator-release-4.2-red-hat-storage-ocs-ci-e2e-aws @@ -260,7 +260,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-odf-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher diff --git a/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.3-presubmits.yaml b/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.3-presubmits.yaml index 3a0cee072bff..ccb0c56f0342 100644 --- a/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.3-presubmits.yaml +++ b/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.3-presubmits.yaml @@ -122,7 +122,7 @@ presubmits: skip_cloning: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-red-hat-storage-ocs-operator-release-4.3-ocs-operator-e2e-aws @@ -179,7 +179,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-odf-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher @@ -202,7 +202,7 @@ presubmits: skip_cloning: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-red-hat-storage-ocs-operator-release-4.3-red-hat-storage-ocs-ci-e2e-aws @@ -259,7 +259,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-odf-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher diff --git a/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.4-presubmits.yaml b/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.4-presubmits.yaml index 2fa9e8216a69..0492cc56b7de 100644 --- a/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.4-presubmits.yaml +++ b/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.4-presubmits.yaml @@ -123,7 +123,7 @@ presubmits: skip_cloning: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-red-hat-storage-ocs-operator-release-4.4-ocs-operator-e2e-aws @@ -180,7 +180,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-odf-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher @@ -203,7 +203,7 @@ presubmits: skip_cloning: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-red-hat-storage-ocs-operator-release-4.4-red-hat-storage-ocs-ci-e2e-aws @@ -260,7 +260,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-odf-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher diff --git a/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.5-presubmits.yaml b/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.5-presubmits.yaml index f711aac2cfd6..3a79b2f8ee66 100644 --- a/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.5-presubmits.yaml +++ b/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.5-presubmits.yaml @@ -123,7 +123,7 @@ presubmits: skip_cloning: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-red-hat-storage-ocs-operator-release-4.5-ocs-operator-e2e-aws @@ -180,7 +180,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-odf-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher @@ -203,7 +203,7 @@ presubmits: skip_cloning: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-red-hat-storage-ocs-operator-release-4.5-red-hat-storage-ocs-ci-e2e-aws @@ -260,7 +260,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-odf-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher diff --git a/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.6-presubmits.yaml b/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.6-presubmits.yaml index 0906966cb13a..9c6d339dde5d 100644 --- a/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.6-presubmits.yaml +++ b/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.6-presubmits.yaml @@ -123,7 +123,7 @@ presubmits: skip_cloning: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-red-hat-storage-ocs-operator-release-4.6-ocs-operator-bundle-e2e-aws @@ -180,7 +180,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-odf-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher @@ -258,7 +258,7 @@ presubmits: skip_cloning: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-red-hat-storage-ocs-operator-release-4.6-red-hat-storage-ocs-ci-e2e-aws @@ -315,7 +315,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-odf-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher diff --git a/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.7-presubmits.yaml b/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.7-presubmits.yaml index f76e877f2ab5..ca59156580f3 100644 --- a/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.7-presubmits.yaml +++ b/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.7-presubmits.yaml @@ -123,7 +123,7 @@ presubmits: skip_cloning: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-red-hat-storage-ocs-operator-release-4.7-ocs-operator-bundle-e2e-aws @@ -180,7 +180,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-odf-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher @@ -258,7 +258,7 @@ presubmits: skip_cloning: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-red-hat-storage-ocs-operator-release-4.7-red-hat-storage-ocs-ci-e2e-aws @@ -315,7 +315,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-odf-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher diff --git a/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.8-periodics.yaml b/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.8-periodics.yaml index 03baff91647b..0af24c85d5ad 100644 --- a/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.8-periodics.yaml +++ b/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.8-periodics.yaml @@ -11,7 +11,7 @@ periodics: repo: ocs-operator labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: periodic-ci-red-hat-storage-ocs-operator-release-4.8-ocs-operator-bundle-master-e2e-aws @@ -67,7 +67,7 @@ periodics: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-odf-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher diff --git a/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.8-presubmits.yaml b/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.8-presubmits.yaml index 2e64ad1ea315..af82e240b6dc 100644 --- a/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.8-presubmits.yaml +++ b/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.8-presubmits.yaml @@ -178,7 +178,7 @@ presubmits: skip_cloning: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-red-hat-storage-ocs-operator-release-4.8-ocs-operator-bundle-e2e-aws @@ -235,7 +235,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-odf-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher @@ -313,7 +313,7 @@ presubmits: skip_cloning: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-red-hat-storage-ocs-operator-release-4.8-red-hat-storage-ocs-ci-e2e-aws @@ -371,7 +371,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-odf-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher diff --git a/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.9-periodics.yaml b/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.9-periodics.yaml index 1e2cb612af98..1e967d99be6e 100644 --- a/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.9-periodics.yaml +++ b/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.9-periodics.yaml @@ -9,7 +9,7 @@ periodics: repo: ocs-operator labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: periodic-ci-red-hat-storage-ocs-operator-release-4.9-ocs-operator-bundle-master-e2e-aws @@ -65,7 +65,7 @@ periodics: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-odf-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher diff --git a/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.9-presubmits.yaml b/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.9-presubmits.yaml index 6ea5dd6ee5de..a1a41d7436e0 100644 --- a/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.9-presubmits.yaml +++ b/ci-operator/jobs/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.9-presubmits.yaml @@ -170,7 +170,7 @@ presubmits: decorate: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-red-hat-storage-ocs-operator-release-4.9-ocs-operator-bundle-e2e-aws @@ -227,7 +227,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-odf-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher @@ -301,7 +301,7 @@ presubmits: decorate: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-red-hat-storage-ocs-operator-release-4.9-red-hat-storage-ocs-ci-e2e-aws @@ -359,7 +359,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-odf-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher diff --git a/ci-operator/jobs/red-hat-storage/odf-console/red-hat-storage-odf-console-master-presubmits.yaml b/ci-operator/jobs/red-hat-storage/odf-console/red-hat-storage-odf-console-master-presubmits.yaml index 45576ca4174b..bf88ef6692ea 100644 --- a/ci-operator/jobs/red-hat-storage/odf-console/red-hat-storage-odf-console-master-presubmits.yaml +++ b/ci-operator/jobs/red-hat-storage/odf-console/red-hat-storage-odf-console-master-presubmits.yaml @@ -63,7 +63,7 @@ presubmits: decorate: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-red-hat-storage-odf-console-master-odf-console-e2e-aws @@ -120,7 +120,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-odf-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher diff --git a/ci-operator/jobs/red-hat-storage/odf-console/red-hat-storage-odf-console-release-4.11-presubmits.yaml b/ci-operator/jobs/red-hat-storage/odf-console/red-hat-storage-odf-console-release-4.11-presubmits.yaml index 1cfa63f36ea7..2fb316cf2d3c 100644 --- a/ci-operator/jobs/red-hat-storage/odf-console/red-hat-storage-odf-console-release-4.11-presubmits.yaml +++ b/ci-operator/jobs/red-hat-storage/odf-console/red-hat-storage-odf-console-release-4.11-presubmits.yaml @@ -129,7 +129,7 @@ presubmits: skip_cloning: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-red-hat-storage-odf-console-release-4.11-odf-console-e2e-aws @@ -186,7 +186,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-odf-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher diff --git a/ci-operator/jobs/red-hat-storage/odf-console/red-hat-storage-odf-console-release-4.12-presubmits.yaml b/ci-operator/jobs/red-hat-storage/odf-console/red-hat-storage-odf-console-release-4.12-presubmits.yaml index ea3b2a04bbea..c6052ba7ca6b 100644 --- a/ci-operator/jobs/red-hat-storage/odf-console/red-hat-storage-odf-console-release-4.12-presubmits.yaml +++ b/ci-operator/jobs/red-hat-storage/odf-console/red-hat-storage-odf-console-release-4.12-presubmits.yaml @@ -129,7 +129,7 @@ presubmits: skip_cloning: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-red-hat-storage-odf-console-release-4.12-odf-console-e2e-aws @@ -186,7 +186,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-odf-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher diff --git a/ci-operator/jobs/red-hat-storage/odf-console/red-hat-storage-odf-console-release-4.13-presubmits.yaml b/ci-operator/jobs/red-hat-storage/odf-console/red-hat-storage-odf-console-release-4.13-presubmits.yaml index 7576f79ac5d7..1432fad5656b 100644 --- a/ci-operator/jobs/red-hat-storage/odf-console/red-hat-storage-odf-console-release-4.13-presubmits.yaml +++ b/ci-operator/jobs/red-hat-storage/odf-console/red-hat-storage-odf-console-release-4.13-presubmits.yaml @@ -63,7 +63,7 @@ presubmits: decorate: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-red-hat-storage-odf-console-release-4.13-odf-console-e2e-aws @@ -120,7 +120,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-odf-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher diff --git a/ci-operator/jobs/red-hat-storage/odf-console/red-hat-storage-odf-console-release-4.14-presubmits.yaml b/ci-operator/jobs/red-hat-storage/odf-console/red-hat-storage-odf-console-release-4.14-presubmits.yaml index f6306581541e..850c51f31274 100644 --- a/ci-operator/jobs/red-hat-storage/odf-console/red-hat-storage-odf-console-release-4.14-presubmits.yaml +++ b/ci-operator/jobs/red-hat-storage/odf-console/red-hat-storage-odf-console-release-4.14-presubmits.yaml @@ -63,7 +63,7 @@ presubmits: decorate: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-red-hat-storage-odf-console-release-4.14-odf-console-e2e-aws @@ -120,7 +120,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-odf-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher diff --git a/ci-operator/jobs/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-main-presubmits.yaml b/ci-operator/jobs/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-main-presubmits.yaml index b36b016d69b3..594a700c99f9 100644 --- a/ci-operator/jobs/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-main-presubmits.yaml +++ b/ci-operator/jobs/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-main-presubmits.yaml @@ -12,7 +12,7 @@ presubmits: skip_cloning: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-red-hat-storage-odf-multicluster-orchestrator-main-integration-test @@ -69,7 +69,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-odf-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher diff --git a/ci-operator/jobs/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.10-presubmits.yaml b/ci-operator/jobs/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.10-presubmits.yaml index 6310f9f309a4..f518d9df1654 100644 --- a/ci-operator/jobs/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.10-presubmits.yaml +++ b/ci-operator/jobs/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.10-presubmits.yaml @@ -12,7 +12,7 @@ presubmits: skip_cloning: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-red-hat-storage-odf-multicluster-orchestrator-release-4.10-integration-test @@ -69,7 +69,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-odf-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher diff --git a/ci-operator/jobs/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.11-presubmits.yaml b/ci-operator/jobs/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.11-presubmits.yaml index c087b3000be1..dc46a6f4b688 100644 --- a/ci-operator/jobs/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.11-presubmits.yaml +++ b/ci-operator/jobs/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.11-presubmits.yaml @@ -12,7 +12,7 @@ presubmits: skip_cloning: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-red-hat-storage-odf-multicluster-orchestrator-release-4.11-integration-test @@ -69,7 +69,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-odf-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher diff --git a/ci-operator/jobs/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.12-presubmits.yaml b/ci-operator/jobs/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.12-presubmits.yaml index 5edef856fa96..422be2c31243 100644 --- a/ci-operator/jobs/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.12-presubmits.yaml +++ b/ci-operator/jobs/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.12-presubmits.yaml @@ -12,7 +12,7 @@ presubmits: skip_cloning: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-red-hat-storage-odf-multicluster-orchestrator-release-4.12-integration-test @@ -69,7 +69,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-odf-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher diff --git a/ci-operator/jobs/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.13-presubmits.yaml b/ci-operator/jobs/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.13-presubmits.yaml index 1426876530a3..4ad7a3b34918 100644 --- a/ci-operator/jobs/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.13-presubmits.yaml +++ b/ci-operator/jobs/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.13-presubmits.yaml @@ -12,7 +12,7 @@ presubmits: skip_cloning: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-red-hat-storage-odf-multicluster-orchestrator-release-4.13-integration-test @@ -69,7 +69,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-odf-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher diff --git a/ci-operator/jobs/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.14-presubmits.yaml b/ci-operator/jobs/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.14-presubmits.yaml index 80c7d3455257..0f32c6a4f53d 100644 --- a/ci-operator/jobs/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.14-presubmits.yaml +++ b/ci-operator/jobs/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.14-presubmits.yaml @@ -12,7 +12,7 @@ presubmits: skip_cloning: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-red-hat-storage-odf-multicluster-orchestrator-release-4.14-integration-test @@ -69,7 +69,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-odf-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher diff --git a/ci-operator/jobs/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.15-presubmits.yaml b/ci-operator/jobs/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.15-presubmits.yaml index abd9cae4c0d1..389202b85c41 100644 --- a/ci-operator/jobs/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.15-presubmits.yaml +++ b/ci-operator/jobs/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.15-presubmits.yaml @@ -12,7 +12,7 @@ presubmits: skip_cloning: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-red-hat-storage-odf-multicluster-orchestrator-release-4.15-integration-test @@ -69,7 +69,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-odf-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher diff --git a/ci-operator/jobs/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.16-presubmits.yaml b/ci-operator/jobs/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.16-presubmits.yaml index b0c848ddad5b..dfaae3ae7ea9 100644 --- a/ci-operator/jobs/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.16-presubmits.yaml +++ b/ci-operator/jobs/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.16-presubmits.yaml @@ -12,7 +12,7 @@ presubmits: skip_cloning: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-red-hat-storage-odf-multicluster-orchestrator-release-4.16-integration-test @@ -69,7 +69,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-odf-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher diff --git a/ci-operator/jobs/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.17-presubmits.yaml b/ci-operator/jobs/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.17-presubmits.yaml index 4e48b739283f..a048aec33c20 100644 --- a/ci-operator/jobs/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.17-presubmits.yaml +++ b/ci-operator/jobs/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.17-presubmits.yaml @@ -12,7 +12,7 @@ presubmits: skip_cloning: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-red-hat-storage-odf-multicluster-orchestrator-release-4.17-integration-test @@ -69,7 +69,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-odf-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher diff --git a/ci-operator/jobs/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.9-presubmits.yaml b/ci-operator/jobs/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.9-presubmits.yaml index f12616b20b7d..f2cb970ea4e7 100644 --- a/ci-operator/jobs/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.9-presubmits.yaml +++ b/ci-operator/jobs/red-hat-storage/odf-multicluster-orchestrator/red-hat-storage-odf-multicluster-orchestrator-release-4.9-presubmits.yaml @@ -12,7 +12,7 @@ presubmits: skip_cloning: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-red-hat-storage-odf-multicluster-orchestrator-release-4.9-integration-test @@ -69,7 +69,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-odf-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher diff --git a/ci-operator/jobs/red-hat-storage/odf-operator/red-hat-storage-odf-operator-main-presubmits.yaml b/ci-operator/jobs/red-hat-storage/odf-operator/red-hat-storage-odf-operator-main-presubmits.yaml index 2163ec7d3079..1ae50d318bb6 100644 --- a/ci-operator/jobs/red-hat-storage/odf-operator/red-hat-storage-odf-operator-main-presubmits.yaml +++ b/ci-operator/jobs/red-hat-storage/odf-operator/red-hat-storage-odf-operator-main-presubmits.yaml @@ -67,7 +67,7 @@ presubmits: skip_cloning: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-red-hat-storage-odf-operator-main-odf-operator-e2e-aws @@ -124,7 +124,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-odf-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher diff --git a/ci-operator/jobs/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.10-presubmits.yaml b/ci-operator/jobs/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.10-presubmits.yaml index e643cc1e3ca5..0cdad304232d 100644 --- a/ci-operator/jobs/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.10-presubmits.yaml +++ b/ci-operator/jobs/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.10-presubmits.yaml @@ -123,7 +123,7 @@ presubmits: skip_cloning: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-red-hat-storage-odf-operator-release-4.10-odf-operator-bundle-e2e-aws @@ -181,7 +181,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-odf-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher diff --git a/ci-operator/jobs/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.11-presubmits.yaml b/ci-operator/jobs/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.11-presubmits.yaml index e39c0718ca37..e390ce04c92c 100644 --- a/ci-operator/jobs/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.11-presubmits.yaml +++ b/ci-operator/jobs/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.11-presubmits.yaml @@ -123,7 +123,7 @@ presubmits: skip_cloning: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-red-hat-storage-odf-operator-release-4.11-odf-operator-bundle-e2e-aws @@ -181,7 +181,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-odf-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher diff --git a/ci-operator/jobs/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.12-presubmits.yaml b/ci-operator/jobs/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.12-presubmits.yaml index bb6ad6e5b44e..ccd5e02d0c02 100644 --- a/ci-operator/jobs/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.12-presubmits.yaml +++ b/ci-operator/jobs/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.12-presubmits.yaml @@ -123,7 +123,7 @@ presubmits: skip_cloning: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-red-hat-storage-odf-operator-release-4.12-odf-operator-bundle-e2e-aws @@ -180,7 +180,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-odf-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher diff --git a/ci-operator/jobs/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.13-presubmits.yaml b/ci-operator/jobs/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.13-presubmits.yaml index 3cc54b5969e3..fae5a3f42539 100644 --- a/ci-operator/jobs/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.13-presubmits.yaml +++ b/ci-operator/jobs/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.13-presubmits.yaml @@ -67,7 +67,7 @@ presubmits: skip_cloning: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-red-hat-storage-odf-operator-release-4.13-odf-operator-e2e-aws @@ -124,7 +124,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-odf-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher diff --git a/ci-operator/jobs/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.14-presubmits.yaml b/ci-operator/jobs/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.14-presubmits.yaml index 6307be14043d..9c1cfe405692 100644 --- a/ci-operator/jobs/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.14-presubmits.yaml +++ b/ci-operator/jobs/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.14-presubmits.yaml @@ -67,7 +67,7 @@ presubmits: skip_cloning: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-red-hat-storage-odf-operator-release-4.14-odf-operator-e2e-aws @@ -124,7 +124,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-odf-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher diff --git a/ci-operator/jobs/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.15-presubmits.yaml b/ci-operator/jobs/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.15-presubmits.yaml index 698d92ef248d..d267d4ca1e52 100644 --- a/ci-operator/jobs/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.15-presubmits.yaml +++ b/ci-operator/jobs/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.15-presubmits.yaml @@ -67,7 +67,7 @@ presubmits: skip_cloning: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-red-hat-storage-odf-operator-release-4.15-odf-operator-e2e-aws @@ -124,7 +124,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-odf-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher diff --git a/ci-operator/jobs/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.9-presubmits.yaml b/ci-operator/jobs/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.9-presubmits.yaml index 51e8102ff220..75d52a8969ec 100644 --- a/ci-operator/jobs/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.9-presubmits.yaml +++ b/ci-operator/jobs/red-hat-storage/odf-operator/red-hat-storage-odf-operator-release-4.9-presubmits.yaml @@ -123,7 +123,7 @@ presubmits: skip_cloning: true labels: ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws + ci-operator.openshift.io/cloud-cluster-profile: odf-aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-red-hat-storage-odf-operator-release-4.9-odf-operator-bundle-e2e-aws @@ -181,7 +181,7 @@ presubmits: secretName: ci-pull-credentials - name: cluster-profile secret: - secretName: cluster-secrets-aws + secretName: cluster-secrets-odf-aws - name: manifest-tool-local-pusher secret: secretName: manifest-tool-local-pusher