update steps to deploy logging operators

openshift · Dec 26, 2024 · 5707bd6 · 5707bd6
1 parent 7380221
commit 5707bd6
Show file tree

Hide file tree

Showing 32 changed files with 132 additions and 671 deletions.
diff --git a/.../openshift-openshift-tests-private-release-4.12__amd64-nightly-openshift-logging-5.6.yaml b/.../openshift-openshift-tests-private-release-4.12__amd64-nightly-openshift-logging-5.6.yaml
@@ -52,14 +52,17 @@ tests:
     cluster_profile: azure-qe
     env:
       BASE_DOMAIN: qe.azure.devcluster.openshift.com
-      CLO_SUB_CHANNEL: stable-5.6
       COMPUTE_NODE_TYPE: Standard_D4s_v3
       E2E_RUN_TAGS: '@logging5.6'
-      EO_SUB_CHANNEL: stable-5.6
       FILTERS_ADDITIONAL: ""
       FIPS_ENABLED: "true"
-      LO_SUB_CHANNEL: stable-5.6
       LOGGING_INDEX_IMAGE: quay.io/openshift-qe-optional-operators/aosqe-index:log5.6
+      OPERATORS: |
+        [
+            {"name": "elasticsearch-operator", "source": "qe-app-registry", "channel": "stable-5.6", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"},
+            {"name": "loki-operator", "source": "qe-app-registry", "channel": "stable-5.6", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"},
+            {"name": "cluster-logging", "source": "qe-app-registry", "channel": "stable-5.6", "install_namespace": "openshift-logging","target_namespaces": "openshift-logging", "operator_group": "openshift-logging"}
+        ]
       TEST_ADDITIONAL: ""
       TEST_FILTERS: CPaasrunOnly;CPaasrunBoth
       TEST_IMPORTANCE: ""
@@ -69,9 +72,7 @@ tests:
       TEST_TIMEOUT: "15"
     test:
     - ref: enable-qe-catalogsource-logging
-    - ref: operatorhub-subscribe-elasticsearch-operator
-    - ref: operatorhub-subscribe-cluster-logging-operator
-    - ref: operatorhub-subscribe-loki-operator
+    - ref: install-operators
     - chain: openshift-e2e-test-logging-qe
     workflow: cucushift-installer-rehearse-azure-ipi
 zz_generated_metadata:

diff --git a/.../openshift-openshift-tests-private-release-4.12__amd64-nightly-openshift-logging-5.7.yaml b/.../openshift-openshift-tests-private-release-4.12__amd64-nightly-openshift-logging-5.7.yaml
@@ -52,14 +52,17 @@ tests:
     cluster_profile: azure-qe
     env:
       BASE_DOMAIN: qe.azure.devcluster.openshift.com
-      CLO_SUB_CHANNEL: stable-5.7
       COMPUTE_NODE_TYPE: Standard_D4s_v3
       E2E_RUN_TAGS: '@logging5.7'
-      EO_SUB_CHANNEL: stable-5.7
       FILTERS_ADDITIONAL: ""
       FIPS_ENABLED: "true"
-      LO_SUB_CHANNEL: stable-5.7
       LOGGING_INDEX_IMAGE: quay.io/openshift-qe-optional-operators/aosqe-index:log5.7
+      OPERATORS: |
+        [
+            {"name": "elasticsearch-operator", "source": "qe-app-registry", "channel": "stable-5.7", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"},
+            {"name": "loki-operator", "source": "qe-app-registry", "channel": "stable-5.7", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"},
+            {"name": "cluster-logging", "source": "qe-app-registry", "channel": "stable-5.7", "install_namespace": "openshift-logging","target_namespaces": "openshift-logging", "operator_group": "openshift-logging"}
+        ]
       TEST_ADDITIONAL: ""
       TEST_FILTERS: CPaasrunOnly;CPaasrunBoth;~Disruptive&;~Longduration&
       TEST_IMPORTANCE: ""
@@ -69,9 +72,7 @@ tests:
       TEST_TIMEOUT: "15"
     test:
     - ref: enable-qe-catalogsource-logging
-    - ref: operatorhub-subscribe-elasticsearch-operator
-    - ref: operatorhub-subscribe-cluster-logging-operator
-    - ref: operatorhub-subscribe-loki-operator
+    - ref: install-operators
     - chain: openshift-e2e-test-logging-qe
     workflow: cucushift-installer-rehearse-azure-ipi
 zz_generated_metadata:

diff --git a/.../openshift-openshift-tests-private-release-4.13__amd64-nightly-openshift-logging-5.7.yaml b/.../openshift-openshift-tests-private-release-4.13__amd64-nightly-openshift-logging-5.7.yaml
@@ -51,14 +51,17 @@ tests:
   steps:
     cluster_profile: gcp-qe
     env:
-      CLO_SUB_CHANNEL: stable-5.7
       COMPUTE_NODE_TYPE: e2-standard-4
       E2E_RUN_TAGS: '@logging5.7'
-      EO_SUB_CHANNEL: stable-5.7
       FILTERS_ADDITIONAL: ""
       FORCE_SUCCESS_EXIT: "true"
-      LO_SUB_CHANNEL: stable-5.7
       LOGGING_INDEX_IMAGE: quay.io/openshift-qe-optional-operators/aosqe-index:log5.7
+      OPERATORS: |
+        [
+            {"name": "elasticsearch-operator", "source": "qe-app-registry", "channel": "stable-5.7", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"},
+            {"name": "loki-operator", "source": "qe-app-registry", "channel": "stable-5.7", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"},
+            {"name": "cluster-logging", "source": "qe-app-registry", "channel": "stable-5.7", "install_namespace": "openshift-logging","target_namespaces": "openshift-logging", "operator_group": "openshift-logging"}
+        ]
       TEST_ADDITIONAL: ""
       TEST_FILTERS: CPaasrunOnly;CPaasrunBoth;~Disruptive&;~Longduration&
       TEST_IMPORTANCE: ""
@@ -68,9 +71,7 @@ tests:
       TEST_TIMEOUT: "15"
     test:
     - ref: enable-qe-catalogsource-logging
-    - ref: operatorhub-subscribe-elasticsearch-operator
-    - ref: operatorhub-subscribe-cluster-logging-operator
-    - ref: operatorhub-subscribe-loki-operator
+    - ref: install-operators
     - chain: openshift-e2e-test-logging-qe
     workflow: cucushift-installer-rehearse-gcp-ipi-proxy-etcd-encryption
 zz_generated_metadata:

diff --git a/.../openshift-openshift-tests-private-release-4.13__amd64-nightly-openshift-logging-5.8.yaml b/.../openshift-openshift-tests-private-release-4.13__amd64-nightly-openshift-logging-5.8.yaml
@@ -52,15 +52,17 @@ tests:
     cluster_profile: azure-qe
     env:
       BASE_DOMAIN: qe.azure.devcluster.openshift.com
-      CLO_SUB_CHANNEL: stable-5.8
-      CLO_TARGET_NAMESPACES: ""
       COMPUTE_NODE_TYPE: Standard_D4s_v3
       E2E_RUN_TAGS: '@logging5.8'
-      EO_SUB_CHANNEL: stable-5.8
       FILTERS_ADDITIONAL: ""
       FORCE_SUCCESS_EXIT: "true"
-      LO_SUB_CHANNEL: stable-5.8
       LOGGING_INDEX_IMAGE: quay.io/openshift-qe-optional-operators/aosqe-index:log5.8
+      OPERATORS: |
+        [
+            {"name": "elasticsearch-operator", "source": "qe-app-registry", "channel": "stable-5.8", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"},
+            {"name": "loki-operator", "source": "qe-app-registry", "channel": "stable-5.8", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"},
+            {"name": "cluster-logging", "source": "qe-app-registry", "channel": "stable-5.8", "install_namespace": "openshift-logging","target_namespaces": "", "operator_group": "openshift-logging"}
+        ]
       TEST_ADDITIONAL: ""
       TEST_FILTERS: CPaasrunOnly;CPaasrunBoth;~Disruptive&;~Longduration&
       TEST_IMPORTANCE: ""
@@ -70,9 +72,7 @@ tests:
       TEST_TIMEOUT: "15"
     test:
     - ref: enable-qe-catalogsource-logging
-    - ref: operatorhub-subscribe-elasticsearch-operator
-    - ref: operatorhub-subscribe-cluster-logging-operator
-    - ref: operatorhub-subscribe-loki-operator
+    - ref: install-operators
     - chain: openshift-e2e-test-logging-qe
     workflow: cucushift-installer-rehearse-azure-ipi-proxy-workers-rhcos-rhel8
 zz_generated_metadata:

diff --git a/.../openshift-openshift-tests-private-release-4.13__arm64-nightly-openshift-logging-5.7.yaml b/.../openshift-openshift-tests-private-release-4.13__arm64-nightly-openshift-logging-5.7.yaml
@@ -61,23 +61,24 @@ tests:
     env:
       BASE_DOMAIN: qe.azure.devcluster.openshift.com
       BOOTSTRAP_NODE_TYPE: Standard_D4ps_v5
-      CLO_SUB_CHANNEL: stable-5.7
       COMPUTE_NODE_TYPE: Standard_D8ps_v5
       CONTROL_PLANE_NODE_TYPE: Standard_D8ps_v5
-      EO_SUB_CHANNEL: stable-5.7
       FORCE_SUCCESS_EXIT: "true"
-      LO_SUB_CHANNEL: stable-5.7
       LOGGING_INDEX_IMAGE: quay.io/openshift-qe-optional-operators/aosqe-index:log5.7
       OCP_ARCH: arm64
+      OPERATORS: |
+        [
+            {"name": "elasticsearch-operator", "source": "qe-app-registry", "channel": "stable-5.7", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"},
+            {"name": "loki-operator", "source": "qe-app-registry", "channel": "stable-5.7", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"},
+            {"name": "cluster-logging", "source": "qe-app-registry", "channel": "stable-5.7", "install_namespace": "openshift-logging","target_namespaces": "openshift-logging", "operator_group": "openshift-logging"}
+        ]
       TEST_FILTERS: Disruptive;Longduration
       TEST_PARALLEL: "3"
       TEST_SCENARIOS: sig-openshift-logging
       TEST_TIMEOUT: "30"
     test:
     - ref: enable-qe-catalogsource-logging
-    - ref: operatorhub-subscribe-elasticsearch-operator
-    - ref: operatorhub-subscribe-cluster-logging-operator
-    - ref: operatorhub-subscribe-loki-operator
+    - ref: install-operators
     - chain: openshift-e2e-test-logging-qe-disruptive
     workflow: cucushift-installer-rehearse-azure-upi
 zz_generated_metadata:

diff --git a/.../openshift-openshift-tests-private-release-4.14__amd64-nightly-openshift-logging-5.8.yaml b/.../openshift-openshift-tests-private-release-4.14__amd64-nightly-openshift-logging-5.8.yaml
@@ -49,16 +49,18 @@ tests:
   steps:
     cluster_profile: gcp-qe
     env:
-      CLO_SUB_CHANNEL: stable-5.8
-      CLO_TARGET_NAMESPACES: ""
       COMPUTE_NODE_TYPE: e2-standard-8
       E2E_RUN_TAGS: '@logging5.8'
-      EO_SUB_CHANNEL: stable-5.8
       FILTERS_ADDITIONAL: ""
       FIPS_ENABLED: "true"
       FORCE_SUCCESS_EXIT: "true"
-      LO_SUB_CHANNEL: stable-5.8
       LOGGING_INDEX_IMAGE: quay.io/openshift-qe-optional-operators/aosqe-index:log5.8
+      OPERATORS: |
+        [
+            {"name": "elasticsearch-operator", "source": "qe-app-registry", "channel": "stable-5.8", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"},
+            {"name": "loki-operator", "source": "qe-app-registry", "channel": "stable-5.8", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"},
+            {"name": "cluster-logging", "source": "qe-app-registry", "channel": "stable-5.8", "install_namespace": "openshift-logging","target_namespaces": "", "operator_group": "openshift-logging"}
+        ]
       TEST_ADDITIONAL: ""
       TEST_FILTERS: CPaasrunOnly;CPaasrunBoth;~Disruptive&;~Longduration&
       TEST_IMPORTANCE: ""
@@ -68,9 +70,7 @@ tests:
       TEST_TIMEOUT: "15"
     test:
     - ref: enable-qe-catalogsource-logging
-    - ref: operatorhub-subscribe-elasticsearch-operator
-    - ref: operatorhub-subscribe-cluster-logging-operator
-    - ref: operatorhub-subscribe-loki-operator
+    - ref: install-operators
     - chain: openshift-e2e-test-logging-qe
     workflow: cucushift-installer-rehearse-gcp-ipi-sdn
 zz_generated_metadata:

diff --git a/.../openshift-openshift-tests-private-release-4.14__amd64-nightly-openshift-logging-6.0.yaml b/.../openshift-openshift-tests-private-release-4.14__amd64-nightly-openshift-logging-6.0.yaml
@@ -43,14 +43,16 @@ tests:
   steps:
     cluster_profile: gcp-qe
     env:
-      CLO_SUB_CHANNEL: stable-6.0
-      CLO_TARGET_NAMESPACES: ""
       COMPUTE_NODE_TYPE: e2-standard-8
       FILTERS_ADDITIONAL: ""
       FIPS_ENABLED: "true"
       FORCE_SUCCESS_EXIT: "true"
-      LO_SUB_CHANNEL: stable-6.0
       LOGGING_INDEX_IMAGE: quay.io/openshift-qe-optional-operators/aosqe-index:log6.0
+      OPERATORS: |
+        [
+            {"name": "loki-operator", "source": "qe-app-registry", "channel": "stable-6.0", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"},
+            {"name": "cluster-logging", "source": "qe-app-registry", "channel": "stable-6.0", "install_namespace": "openshift-logging","target_namespaces": "", "operator_group": "openshift-logging"}
+        ]
       TEST_ADDITIONAL: ""
       TEST_FILTERS: CPaasrunOnly;CPaasrunBoth;~Disruptive&;~Longduration&
       TEST_IMPORTANCE: ""
@@ -60,8 +62,7 @@ tests:
       TEST_TIMEOUT: "15"
     test:
     - ref: enable-qe-catalogsource-logging
-    - ref: operatorhub-subscribe-cluster-logging-operator
-    - ref: operatorhub-subscribe-loki-operator
+    - ref: install-operators
     - chain: openshift-e2e-test-logging-qe
     workflow: cucushift-installer-rehearse-gcp-ipi-sdn
 zz_generated_metadata:

diff --git a/.../openshift-openshift-tests-private-release-4.14__arm64-nightly-openshift-logging-5.8.yaml b/.../openshift-openshift-tests-private-release-4.14__arm64-nightly-openshift-logging-5.8.yaml
@@ -68,24 +68,24 @@ tests:
       OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest
     env:
       BASE_DOMAIN: qe.devcluster.openshift.com
-      CLO_SUB_CHANNEL: stable-5.8
-      CLO_TARGET_NAMESPACES: ""
       COMPUTE_NODE_TYPE: m6g.xlarge
       CONTROL_PLANE_INSTANCE_TYPE: m6g.xlarge
-      EO_SUB_CHANNEL: stable-5.8
       FORCE_SUCCESS_EXIT: "true"
-      LO_SUB_CHANNEL: stable-5.8
       LOGGING_INDEX_IMAGE: quay.io/openshift-qe-optional-operators/aosqe-index:log5.8
       OCP_ARCH: arm64
+      OPERATORS: |
+        [
+            {"name": "elasticsearch-operator", "source": "qe-app-registry", "channel": "stable-5.8", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"},
+            {"name": "loki-operator", "source": "qe-app-registry", "channel": "stable-5.8", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"},
+            {"name": "cluster-logging", "source": "qe-app-registry", "channel": "stable-5.8", "install_namespace": "openshift-logging","target_namespaces": "", "operator_group": "openshift-logging"}
+        ]
       TEST_FILTERS: Disruptive;Longduration
       TEST_PARALLEL: "3"
       TEST_SCENARIOS: sig-openshift-logging
       TEST_TIMEOUT: "30"
     test:
     - ref: enable-qe-catalogsource-logging
-    - ref: operatorhub-subscribe-elasticsearch-operator
-    - ref: operatorhub-subscribe-cluster-logging-operator
-    - ref: operatorhub-subscribe-loki-operator
+    - ref: install-operators
     - chain: openshift-e2e-test-logging-qe-disruptive
     workflow: cucushift-installer-rehearse-aws-ipi
 zz_generated_metadata:

diff --git a/.../openshift-openshift-tests-private-release-4.14__multi-nightly-openshift-logging-5.7.yaml b/.../openshift-openshift-tests-private-release-4.14__multi-nightly-openshift-logging-5.7.yaml
@@ -52,12 +52,15 @@ tests:
       OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:multi-latest
     env:
       BASE_DOMAIN: qe.devcluster.openshift.com
-      CLO_SUB_CHANNEL: stable-5.7
       E2E_RUN_TAGS: '@logging5.7'
-      EO_SUB_CHANNEL: stable-5.7
       FILTERS_ADDITIONAL: ""
-      LO_SUB_CHANNEL: stable-5.7
       LOGGING_INDEX_IMAGE: quay.io/openshift-qe-optional-operators/aosqe-index:log5.7
+      OPERATORS: |
+        [
+            {"name": "elasticsearch-operator", "source": "qe-app-registry", "channel": "stable-5.7", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"},
+            {"name": "loki-operator", "source": "qe-app-registry", "channel": "stable-5.7", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"},
+            {"name": "cluster-logging", "source": "qe-app-registry", "channel": "stable-5.7", "install_namespace": "openshift-logging","target_namespaces": "openshift-logging", "operator_group": "openshift-logging"}
+        ]
       TEST_ADDITIONAL: ""
       TEST_FILTERS: CPaasrunOnly;CPaasrunBoth;~Disruptive&;~Longduration&
       TEST_IMPORTANCE: ""
@@ -68,9 +71,7 @@ tests:
     test:
     - ref: ipi-install-heterogeneous
     - ref: enable-qe-catalogsource-logging
-    - ref: operatorhub-subscribe-elasticsearch-operator
-    - ref: operatorhub-subscribe-cluster-logging-operator
-    - ref: operatorhub-subscribe-loki-operator
+    - ref: install-operators
     - chain: openshift-e2e-test-logging-qe
     workflow: cucushift-installer-rehearse-aws-ipi-ovn-ipsec
 zz_generated_metadata:

diff --git a/.../openshift-openshift-tests-private-release-4.15__amd64-nightly-openshift-logging-5.9.yaml b/.../openshift-openshift-tests-private-release-4.15__amd64-nightly-openshift-logging-5.9.yaml
@@ -84,15 +84,16 @@ tests:
     cluster_profile: azure-qe
     env:
       BASE_DOMAIN: qe.azure.devcluster.openshift.com
-      CLO_SUB_CHANNEL: stable-5.9
-      CLO_TARGET_NAMESPACES: ""
       COMPUTE_NODE_TYPE: Standard_D4s_v3
-      EO_SUB_CHANNEL: stable
-      EO_SUB_SOURCE: redhat-operators
       FILTERS_ADDITIONAL: ""
       FORCE_SUCCESS_EXIT: "true"
-      LO_SUB_CHANNEL: stable-5.9
       LOGGING_INDEX_IMAGE: quay.io/openshift-qe-optional-operators/aosqe-index:log5.9
+      OPERATORS: |
+        [
+            {"name": "elasticsearch-operator", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"},
+            {"name": "loki-operator", "source": "qe-app-registry", "channel": "stable-5.9", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"},
+            {"name": "cluster-logging-operator", "source": "qe-app-registry", "channel": "stable-5.9", "install_namespace": "openshift-logging","target_namespaces": "", "operator_group": "openshift-logging"}
+        ]
       TEST_ADDITIONAL: ""
       TEST_FILTERS: CPaasrunOnly;CPaasrunBoth;~Disruptive&;~Longduration&
       TEST_IMPORTANCE: ""
@@ -102,9 +103,7 @@ tests:
       TEST_TIMEOUT: "15"
     test:
     - ref: enable-qe-catalogsource-logging
-    - ref: operatorhub-subscribe-cluster-logging-operator
-    - ref: operatorhub-subscribe-loki-operator
-    - ref: operatorhub-subscribe-elasticsearch-operator
+    - ref: install-operators
     - chain: openshift-e2e-test-logging-qe
     workflow: cucushift-installer-rehearse-azure-ipi-proxy-workers-rhcos-rhel8
 - as: aws-ipi-f14-disruptive-logging
@@ -113,23 +112,22 @@ tests:
     cluster_profile: aws-qe
     env:
       BASE_DOMAIN: qe.devcluster.openshift.com
-      CLO_SUB_CHANNEL: stable-5.9
-      CLO_TARGET_NAMESPACES: ""
       COMPUTE_NODE_TYPE: m5.2xlarge
-      EO_SUB_CHANNEL: stable
-      EO_SUB_SOURCE: redhat-operators
       FORCE_SUCCESS_EXIT: "true"
-      LO_SUB_CHANNEL: stable-5.9
       LOGGING_INDEX_IMAGE: quay.io/openshift-qe-optional-operators/aosqe-index:log5.9
+      OPERATORS: |
+        [
+            {"name": "elasticsearch-operator", "source": "redhat-operators", "channel": "stable", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"},
+            {"name": "loki-operator", "source": "qe-app-registry", "channel": "stable-5.9", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"},
+            {"name": "cluster-logging", "source": "qe-app-registry", "channel": "stable-5.9", "install_namespace": "openshift-logging","target_namespaces": "", "operator_group": "openshift-logging"}
+        ]
       TEST_FILTERS: Disruptive;Longduration
       TEST_PARALLEL: "3"
       TEST_SCENARIOS: sig-openshift-logging
       TEST_TIMEOUT: "30"
     test:
     - ref: enable-qe-catalogsource-logging
-    - ref: operatorhub-subscribe-cluster-logging-operator
-    - ref: operatorhub-subscribe-loki-operator
-    - ref: operatorhub-subscribe-elasticsearch-operator
+    - ref: install-operators
     - chain: openshift-e2e-test-logging-qe-disruptive
     workflow: cucushift-installer-rehearse-aws-ipi
 zz_generated_metadata:

diff --git a/.../openshift-openshift-tests-private-release-4.15__multi-nightly-openshift-logging-5.8.yaml b/.../openshift-openshift-tests-private-release-4.15__multi-nightly-openshift-logging-5.8.yaml
@@ -55,17 +55,19 @@ tests:
       ADDITIONAL_WORKER_VM_TYPE: m6i.xlarge
       ADDITIONAL_WORKERS: "1"
       BASE_DOMAIN: qe.devcluster.openshift.com
-      CLO_SUB_CHANNEL: stable-5.8
-      CLO_TARGET_NAMESPACES: ""
       COMPUTE_NODE_REPLICAS: "2"
       COMPUTE_NODE_TYPE: m6g.xlarge
       CONTROL_PLANE_INSTANCE_TYPE: m6g.xlarge
       E2E_RUN_TAGS: '@logging5.8'
-      EO_SUB_CHANNEL: stable-5.8
       FILTERS_ADDITIONAL: ""
-      LO_SUB_CHANNEL: stable-5.8
       LOGGING_INDEX_IMAGE: quay.io/openshift-qe-optional-operators/aosqe-index:log5.8
       OCP_ARCH: arm64
+      OPERATORS: |
+        [
+            {"name": "elasticsearch-operator", "source": "qe-app-registry", "channel": "stable-5.8", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"},
+            {"name": "loki-operator", "source": "qe-app-registry", "channel": "stable-5.8", "install_namespace": "openshift-operators-redhat","target_namespaces": "", "operator_group": "openshift-operators-redhat"},
+            {"name": "cluster-logging", "source": "qe-app-registry", "channel": "stable-5.8", "install_namespace": "openshift-logging","target_namespaces": "", "operator_group": "openshift-logging"}
+        ]
       TEST_ADDITIONAL: ""
       TEST_FILTERS: CPaasrunOnly;CPaasrunBoth;~Disruptive&;~Longduration&
       TEST_IMPORTANCE: ""
@@ -76,9 +78,7 @@ tests:
     test:
     - ref: ipi-install-heterogeneous
     - ref: enable-qe-catalogsource-logging
-    - ref: operatorhub-subscribe-elasticsearch-operator
-    - ref: operatorhub-subscribe-cluster-logging-operator
-    - ref: operatorhub-subscribe-loki-operator
+    - ref: install-operators
     - chain: openshift-e2e-test-logging-qe
     workflow: cucushift-installer-rehearse-aws-ipi-ovn-ipsec
 zz_generated_metadata: