Revert "[ISV-4837] Incorrect behaviour of the operator pipelines when a PR af…" (#682)

This reverts commit 02d8e9f.

Author: wcheang

ansible/roles/operator-pipeline/templates/openshift/pipelines/operator-hosted-pipeline.yml

@@ -440,9 +440,8 @@ spec:
         kind: Task
       runAfter:
         - build-fragment-images
-      when:
-        - &bundleAdded
-          input: "$(tasks.detect-changes.results.added_bundle)"
+      when: &bundleAdded
+        - input: "$(tasks.detect-changes.results.added_bundle)"
           operator: notin
           values: [""]
       params:
@@ -466,8 +465,6 @@ spec:
         name: content-hash
       runAfter:
         - apply-test-waivers
-      when:
-        - *bundleAdded
       params:
         - name: pipeline_image
           value: "$(params.pipeline_image)"
@@ -487,8 +484,8 @@ spec:
       params:
         - name: pipeline_image
           value: "$(params.pipeline_image)"
-        - name: operator_path
-          value: "$(tasks.detect-changes.results.operator_path)"
+        - name: bundle_path
+          value: "$(tasks.detect-changes.results.bundle_path)"
         - name: cert_project_required
           value: "$(params.cert_project_required)"
       workspaces:
@@ -540,9 +537,8 @@ spec:
         - get-pyxis-certification-data
       taskRef:
         name: verify-project
-      when:
-        - &certProjectExists
-          input: "$(tasks.certification-project-check.results.certification_project_id)"
+      when: &certProjectExists
+        - input: "$(tasks.certification-project-check.results.certification_project_id)"
           operator: "notin"
           values: [""]
       params:
@@ -562,8 +558,7 @@ spec:
         - verify-project
       taskRef:
         name: update-cert-project-status
-      when:
-        - *certProjectExists
+      when: *certProjectExists
       params:
         - name: pipeline_image
           value: "$(params.pipeline_image)"
@@ -588,8 +583,7 @@ spec:
         - update-cert-project-status
       taskRef:
         name: reserve-operator-name
-      when:
-        - *certProjectExists
+      when: *certProjectExists
       params:
         - name: pipeline_image
           value: "$(params.pipeline_image)"
@@ -668,12 +662,10 @@ spec:
         - static-tests-results
       taskRef:
         name: yaml-lint
-      when:
-        - &operatorOrBundleChange
-          input: "$(tasks.detect-changes.results.affected_catalogs)"
+      when: &operatorOrBundleChange
+        - input: "$(tasks.detect-changes.results.affected_catalogs)"
           operator: in
           values: [""]
-        - *bundleAdded
       params:
         - name: pipeline_image
           value: "$(params.pipeline_image)"
@@ -786,8 +778,7 @@ spec:
     - name: make-bundle-repo-public
       runAfter:
         - build-bundle
-      when:
-        - *operatorOrBundleChange
+      when: *operatorOrBundleChange
       taskRef:
         name: set-quay-repo-visibility
       params:
@@ -853,8 +844,7 @@ spec:
     - name: add-bundle-to-index
       runAfter:
         - add-fbc-fragments-to-index
-      when:
-        - *operatorOrBundleChange
+      when: *operatorOrBundleChange
       taskRef:
         name: add-bundle-to-index
       params:
@@ -888,8 +878,7 @@ spec:
     - name: make-index-repo-public
       runAfter:
         - add-bundle-to-index
-      when:
-        - *operatorOrBundleChange
+      when: *operatorOrBundleChange
       taskRef:
         name: set-quay-repo-visibility
       params:
@@ -909,8 +898,6 @@ spec:
     - name: get-ci-results-attempt
       runAfter:
         - make-index-repo-public
-      when:
-        - *bundleAdded
       taskRef:
         name: get-ci-results-attempt
       params:
@@ -996,7 +983,6 @@ spec:
         - input: "$(tasks.detect-changes.results.affected_catalogs)"
           operator: in
           values: [""]
-        - *bundleAdded
       params:
         - name: pipeline_image
           value: "$(params.pipeline_image)"
@@ -1037,7 +1023,9 @@ spec:
         kind: Task
         name: evaluate-preflight-result
       when:
-        - *bundleAdded
+        - input: "$(tasks.detect-changes.results.added_bundle)"
+          operator: notin
+          values: [""]
         - input: "$(tasks.detect-changes.results.affected_catalogs)"
           operator: in
           values: [""]
@@ -1068,8 +1056,6 @@ spec:
         - evaluate-preflight-result
       taskRef:
         name: get-ci-results
-      when:
-        - *bundleAdded
       params:
         - name: pipeline_image
           value: "$(params.pipeline_image)"
@@ -1215,9 +1201,7 @@ spec:
     - name: upload-pipeline-logs
       taskRef:
         name: upload-pipeline-logs
-      when:
-        - *certProjectExists
-        - *bundleAdded
+      when: *certProjectExists
       params:
         - name: pipeline_image
           value: "$(params.pipeline_image)"
@@ -1281,8 +1265,7 @@ spec:
     - name: github-add-connect-url-comment
       taskRef:
         name: github-add-comment
-      when:
-        - *certProjectExists
+      when: *certProjectExists
       params:
         - name: pipeline_image
           value: "$(params.pipeline_image)"

ansible/roles/operator-pipeline/templates/openshift/pipelines/operator-release-pipeline.yml

@@ -237,11 +237,6 @@ spec:
     - name: content-hash
       runAfter:
         - read-config
-      when:
-        - &bundleAdded
-          input: "$(tasks.detect-changes.results.added_bundle)"
-          operator: notin
-          values: [""]
       taskRef:
         name: content-hash
       params:
@@ -263,8 +258,8 @@ spec:
       params:
         - name: pipeline_image
           value: "$(params.pipeline_image)"
-        - name: operator_path
-          value: "$(tasks.detect-changes.results.operator_path)"
+        - name: bundle_path
+          value: "$(tasks.detect-changes.results.bundle_path)"
         - name: cert_project_required
           value: "$(params.cert_project_required)"
       workspaces:
@@ -346,9 +341,8 @@ spec:
         - copy-bundle-image-to-released-registry
       taskRef:
         name: publish-pyxis-data
-      when:
-        - &certProjectExists
-          input: "$(tasks.certification-project-check.results.certification_project_id)"
+      when: &certProjectExists
+        - input: "$(tasks.certification-project-check.results.certification_project_id)"
           operator: "notin"
           values: [""]
         - input: "$(tasks.detect-changes.results.added_bundle)"
@@ -678,9 +672,7 @@ spec:
     - name: upload-pipeline-logs
       taskRef:
         name: upload-pipeline-logs
-      when:
-        - *certProjectExists
-        - *bundleAdded
+      when: *certProjectExists
       params:
         - name: pipeline_image
           value: "$(params.pipeline_image)"

ansible/roles/operator-pipeline/templates/openshift/tasks/cert-project-check.yml

@@ -6,8 +6,8 @@ metadata:
 spec:
   params:
     - name: pipeline_image
-    - name: operator_path
-      description: path indicating the location of the certified operator within the repository
+    - name: bundle_path
+      description: path indicating the location of the certified bundle within the repository
     - name: cert_project_required
       description: A flag determines whether a cert project ID needs to be present
       default: "true"
@@ -31,7 +31,9 @@ spec:
           exit 0
         fi
 
-        CI_FILE_PATH="$(params.operator_path)/ci.yaml"
+        PKG_PATH=$(dirname $(realpath $(params.bundle_path)))
+
+        CI_FILE_PATH="$PKG_PATH/ci.yaml"
 
         CERT_PROJECT_ID=$(cat $CI_FILE_PATH | yq -r '.cert_project_id | select (.!=null)')