Update the when condition for the tekton tasks.

redhat-openshift-ecosystem · Jun 14, 2024 · bea6dd1 · bea6dd1
1 parent aaa0f97
commit bea6dd1
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 9 deletions.
diff --git a/ansible/roles/operator-pipeline/templates/openshift/pipelines/operator-hosted-pipeline.yml b/ansible/roles/operator-pipeline/templates/openshift/pipelines/operator-hosted-pipeline.yml
@@ -465,6 +465,7 @@ spec:
         name: content-hash
       runAfter:
         - apply-test-waivers
+      when: *bundleAdded
       params:
         - name: pipeline_image
           value: "$(params.pipeline_image)"
@@ -484,8 +485,8 @@ spec:
       params:
         - name: pipeline_image
           value: "$(params.pipeline_image)"
-        - name: bundle_path
-          value: "$(tasks.detect-changes.results.bundle_path)"
+        - name: operator_path
+          value: "$(tasks.detect-changes.results.operator_path)"
         - name: cert_project_required
           value: "$(params.cert_project_required)"
       workspaces:
@@ -898,6 +899,7 @@ spec:
     - name: get-ci-results-attempt
       runAfter:
         - make-index-repo-public
+      when: *bundleAdded
       taskRef:
         name: get-ci-results-attempt
       params:
@@ -983,6 +985,9 @@ spec:
         - input: "$(tasks.detect-changes.results.affected_catalogs)"
           operator: in
           values: [""]
+        - input: "$(tasks.detect-changes.results.added_bundle)"
+          operator: notin
+          values: [""]
       params:
         - name: pipeline_image
           value: "$(params.pipeline_image)"
@@ -1056,6 +1061,7 @@ spec:
         - evaluate-preflight-result
       taskRef:
         name: get-ci-results
+      when: *bundleAdded
       params:
         - name: pipeline_image
           value: "$(params.pipeline_image)"
@@ -1201,7 +1207,9 @@ spec:
     - name: upload-pipeline-logs
       taskRef:
         name: upload-pipeline-logs
-      when: *certProjectExists
+      when: 
+        - *certProjectExists
+        - *bundleAdded
       params:
         - name: pipeline_image
           value: "$(params.pipeline_image)"

diff --git a/ansible/roles/operator-pipeline/templates/openshift/pipelines/operator-release-pipeline.yml b/ansible/roles/operator-pipeline/templates/openshift/pipelines/operator-release-pipeline.yml
@@ -237,6 +237,10 @@ spec:
     - name: content-hash
       runAfter:
         - read-config
+      when: &bundleAdded
+        - input: "$(tasks.detect-changes.results.added_bundle)"
+          operator: notin
+          values: [""]
       taskRef:
         name: content-hash
       params:
@@ -258,8 +262,8 @@ spec:
       params:
         - name: pipeline_image
           value: "$(params.pipeline_image)"
-        - name: bundle_path
-          value: "$(tasks.detect-changes.results.bundle_path)"
+        - name: operator_path
+          value: "$(tasks.detect-changes.results.operator_path)"
         - name: cert_project_required
           value: "$(params.cert_project_required)"
       workspaces:
@@ -662,7 +666,9 @@ spec:
     - name: upload-pipeline-logs
       taskRef:
         name: upload-pipeline-logs
-      when: *certProjectExists
+      when: 
+        - *certProjectExists
+        - *bundleAdded
       params:
         - name: pipeline_image
           value: "$(params.pipeline_image)"

diff --git a/ansible/roles/operator-pipeline/templates/openshift/tasks/cert-project-check.yml b/ansible/roles/operator-pipeline/templates/openshift/tasks/cert-project-check.yml
@@ -6,8 +6,8 @@ metadata:
 spec:
   params:
     - name: pipeline_image
-    - name: bundle_path
-      description: path indicating the location of the certified bundle within the repository
+    - name: operator_path
+      description: path indicating the location of the certified operator 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,7 @@ spec:
           exit 0
         fi
 
-        PKG_PATH=$(dirname $(realpath $(params.bundle_path)))
+        PKG_PATH=$(realpath $(params.operator_path))
 
         CI_FILE_PATH="$PKG_PATH/ci.yaml"