[loki] add loki-operator package to CLO's e2e jobs

ci-operator/config/openshift/cluster-logging-operator/openshift-cluster-logging-operator-master.yaml

@@ -55,6 +55,10 @@ base_images:
     name: "4.11"
     namespace: ocp
     tag: oauth-proxy
+  operator-index:
+    name: redhat-operator-index
+    namespace: ci
+    tag: v4.11
 build_root:
   image_stream_tag:
     name: release
@@ -73,6 +77,7 @@ operator:
   bundles:
   - as: cluster-logging-operator-bundle
     dockerfile_path: bundle.Dockerfile
+    skip_building_index: true
   substitutions:
   - pullspec: quay.io/openshift-logging/cluster-logging-operator:latest
     with: pipeline:cluster-logging-operator
@@ -111,6 +116,11 @@ tests:
 - as: e2e-target
   steps:
     cluster_profile: gcp
+    env:
+      OO_CHANNEL: stable
+      OO_INSTALL_NAMESPACE: openshift-operators-redhat
+      OO_PACKAGE: loki-operator
+      OO_TARGET_NAMESPACES: '!all'
     test:
     - as: test
       cli: latest
@@ -145,12 +155,14 @@ tests:
         name: pipeline:logging-eventrouter
       - env: IMAGE_LOG_FILE_METRIC_EXPORTER
         name: pipeline:log-file-metric-exporter
+      - env: OO_BUNDLE
+        name: cluster-logging-operator-bundle
       from: pipeline:cluster-logging-operator-e2e
       resources:
         requests:
           cpu: 100m
       timeout: 3h0m0s
-    workflow: openshift-e2e-gcp
+    workflow: optional-operators-ci-generic-claim
   timeout: 5h0m0s
 - as: e2e-ocp-target-minus-one
   cluster_claim:

ci-operator/jobs/openshift/cluster-logging-operator/openshift-cluster-logging-operator-master-presubmits.yaml

@@ -6,23 +6,23 @@ presubmits:
     - ^master$
     - ^master-
     cluster: build02
-    context: ci/prow/ci-index-cluster-logging-operator-bundle
+    context: ci/prow/ci-bundle-cluster-logging-operator-bundle
     decorate: true
     decoration_config:
       skip_cloning: true
     labels:
       ci.openshift.io/generator: prowgen
       job-release: "4.13"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-cluster-logging-operator-master-ci-index-cluster-logging-operator-bundle
-    rerun_command: /test ci-index-cluster-logging-operator-bundle
+    name: pull-ci-openshift-cluster-logging-operator-master-ci-bundle-cluster-logging-operator-bundle
+    rerun_command: /test ci-bundle-cluster-logging-operator-bundle
     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=ci-index-cluster-logging-operator-bundle
+        - --target=cluster-logging-operator-bundle
         command:
         - ci-operator
         image: ci-operator:latest
@@ -49,7 +49,7 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )ci-index-cluster-logging-operator-bundle,?($|\s.*)
+    trigger: (?m)^/test( | .* )ci-bundle-cluster-logging-operator-bundle,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches: