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 <[email protected]> * Switch to odf-aws cluster profile for ocs-operator repo Signed-off-by: Malay Kumar Parida <[email protected]> * Switch to odf-aws cluster profile for odf-console repo Signed-off-by: Malay Kumar Parida <[email protected]> * Switch to odf-aws cluster profile for odf-multicluster-orchestrator repo Signed-off-by: Malay Kumar Parida <[email protected]> * Switch to odf-aws cluster profile for odf-operator repo Signed-off-by: Malay Kumar Parida <[email protected]> * Add make update changes Signed-off-by: Malay Kumar Parida <[email protected]> --------- Signed-off-by: Malay Kumar Parida <[email protected]>
openshift · Feb 21, 2024 · cb43923 · cb43923
1 parent eee203d
commit cb43923
Show file tree

Hide file tree

Showing 86 changed files with 244 additions and 681 deletions.
diff --git a/ci-operator/config/red-hat-storage/mcg-ms-console/OWNERS b/ci-operator/config/red-hat-storage/mcg-ms-console/OWNERS
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
diff --git a/ci-operator/config/red-hat-storage/mcg-osd-deployer/OWNERS b/ci-operator/config/red-hat-storage/mcg-osd-deployer/OWNERS
diff --git a/...erator/config/red-hat-storage/mcg-osd-deployer/red-hat-storage-mcg-osd-deployer-main.yaml b/...erator/config/red-hat-storage/mcg-osd-deployer/red-hat-storage-mcg-osd-deployer-main.yaml
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
@@ -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/...erator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.10.yaml b/...erator/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/...erator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.11.yaml b/...erator/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/...erator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.12.yaml b/...erator/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/...erator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.13.yaml b/...erator/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/...erator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.14.yaml b/...erator/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/...erator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.15.yaml b/...erator/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/...perator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.2.yaml b/...perator/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/...perator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.3.yaml b/...perator/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/...perator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.4.yaml b/...perator/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/...perator/config/red-hat-storage/ocs-operator/red-hat-storage-ocs-operator-release-4.5.yaml b/...perator/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