Clean up dependency installation in stf-run-ci (#455)

* Clean up dependency installation in stf-run-ci

Clean up the dependency installation when not using index images (which
installs dependencies via dependencies.yaml). Adjust installation of
cert-manager for versions of OCP 4.10 vs 4.12 and later.

* Move ObO CatalogSource removal to pre-clean stage

build/stf-run-ci/tasks/pre-clean.yml

@@ -48,6 +48,19 @@
         displayName: OperatorHub.io Operators
         publisher: OperatorHub.io
 
+# Upstream Source + Sub from https://github.com/rhobs/observability-operator/tree/main/hack/olm
+# Moved to using Community Operators Catalog, so no longer require upstream CatalogSource. Eventually move to Red Hat Operators CatalogSource.
+- name: Remove Red Hat Observability Operator CatalogSource if it is installed
+  k8s:
+    state: absent
+    definition:
+      apiVersion: operators.coreos.com/v1alpha1
+      kind: CatalogSource
+      metadata:
+        annotations:
+        name: observability-operator
+        namespace: openshift-marketplace
+
 - name: Remove CloudOps CatalogSource if it is installed
   k8s:
     state: absent
@@ -130,4 +143,4 @@
       kind: Elasticsearch
       metadata:
         name: elasticsearch
-        namespace: "{{ namespace }}"
+        namespace: "{{ namespace }}"

build/stf-run-ci/tasks/setup_base.yml

@@ -13,10 +13,10 @@
           name: certified-operators
         - disabled: false
           name: redhat-operators
-        - disabled: "{{ false if __service_telemetry_observability_strategy in ['use_community', 'use_hybrid'] else true }}"
+        - disabled: false
           name: community-operators
 
-- name: Create OperatorGroup
+- name: Create OperatorGroup for service-telemetry
   k8s:
     definition:
       apiVersion: operators.coreos.com/v1
@@ -28,7 +28,8 @@
         targetNamespaces:
         - "{{ namespace }}"
 
-- when: not __deploy_from_index_enabled | bool
+# deploy cert-manager from tech-preview when using versions of OCP < 4.12
+- when: not __deploy_from_index_enabled | bool and ocp_ver.stdout is version ('4.12', '<')
   block:
     - name: Create openshift-cert-manager-operator namespace
       k8s:
@@ -66,6 +67,28 @@
             source: redhat-operators
             sourceNamespace: openshift-marketplace
 
+# deploy cert-manager from stable-v1 in 4.12 and later using namespace scoped operator
+- when: not __deploy_from_index_enabled | bool and ocp_ver.stdout is version ('4.12', '>=')
+  block:
+    - name: Subscribe to Cert Manager for OpenShift Operator
+      k8s:
+        definition:
+          apiVersion: operators.coreos.com/v1alpha1
+          kind: Subscription
+          metadata:
+            labels:
+              operators.coreos.com/openshift-cert-manager-operator.service-telemetry: ""
+            name: openshift-cert-manager-operator-stable-v1-redhat-operators-openshift-marketplace
+            namespace: service-telemetry
+          spec:
+            channel: stable-v1
+            installPlanApproval: Automatic
+            name: openshift-cert-manager-operator
+            source: redhat-operators
+            sourceNamespace: openshift-marketplace
+
+- when: not __deploy_from_index_enabled | bool
+  block:
     - name: Subscribe to AMQ Interconnect Operator
       k8s:
         definition:
@@ -98,6 +121,25 @@
       when:
         - __service_telemetry_observability_strategy == "use_community"
 
+    - name: Subscribe to Red Hat Obervability Operator
+      k8s:
+        definition:
+          apiVersion: operators.coreos.com/v1alpha1
+          kind: Subscription
+          metadata:
+            labels:
+              operators.coreos.com/observability-operator.openshift-operators: ""
+            name: observability-operator
+            namespace: openshift-operators
+          spec:
+            channel: stable
+            installPlanApproval: Automatic
+            name: observability-operator
+            source: community-operators
+            sourceNamespace: openshift-marketplace
+      when:
+        - __service_telemetry_observability_strategy in ['use_redhat', 'use_hybrid']
+
 - name: Subscribe to Elastic Cloud on Kubernetes Operator
   k8s:
     definition:
@@ -122,45 +164,3 @@
   until: eckCRD.resources[0] is defined
   retries: 5
   delay: 30
-
-- block:
-  # Upstream Source + Sub from https://github.com/rhobs/observability-operator/tree/main/hack/olm
-  - name: Create CatalogSource for Red Hat Observability Operator
-    k8s:
-      definition:
-        apiVersion: operators.coreos.com/v1alpha1
-        kind: CatalogSource
-        metadata:
-          annotations:
-          name: observability-operator
-          namespace: openshift-marketplace
-        spec:
-          displayName: Observability Operator - Test
-          icon:
-            base64data: ""
-            mediatype: ""
-          image: quay.io/rhobs/observability-operator-catalog:latest
-          publisher: Sunil Thaha
-          sourceType: grpc
-          updateStrategy:
-            registryPoll:
-              interval: 10m0s
-
-  - name: Subscribe to Red Hat Obervability Operator
-    k8s:
-      definition:
-        apiVersion: operators.coreos.com/v1alpha1
-        kind: Subscription
-        metadata:
-          labels:
-            operators.coreos.com/observability-operator.openshift-operators: ""
-          name: observability-operator
-          namespace: openshift-operators
-        spec:
-          channel: development
-          installPlanApproval: Automatic
-          name: observability-operator
-          source: observability-operator
-          sourceNamespace: openshift-marketplace
-  when:
-    - __service_telemetry_observability_strategy in ['use_redhat', 'use_hybrid']