From af82ade77e15733b87d9d99d6c42699089a31670 Mon Sep 17 00:00:00 2001 From: mkolasinski-splunk Date: Fri, 10 Nov 2023 11:37:41 +0100 Subject: [PATCH] chore: align if condition for cancelling workflow --- .github/workflows/reusable-build-test-release.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/reusable-build-test-release.yml b/.github/workflows/reusable-build-test-release.yml index a87376e45..2c93a5bff 100644 --- a/.github/workflows/reusable-build-test-release.yml +++ b/.github/workflows/reusable-build-test-release.yml @@ -1141,7 +1141,7 @@ jobs: - name: Cancel workflow env: ARGO_TOKEN: ${{ steps.get-argo-token.outputs.argo-token }} - if: ${{ cancelled() }} || ${{ steps.is-pod-deleted.outcome }} != 'success' + if: ${{ cancelled() || steps.is-pod-deleted.outcome != 'success' }} run: | cancel_response=$(argo submit -v -o json --from wftmpl/${{ needs.setup.outputs.argo-cancel-workflow-tmpl-name }} -l workflows.argoproj.io/workflow-template=${{ needs.setup.outputs.argo-cancel-workflow-tmpl-name }} --argo-base-href '' -p workflow-to-cancel=${{ steps.run-tests.outputs.workflow-name }}) cancel_workflow_name=$( echo "$cancel_response" |jq -r '.metadata.name' ) @@ -1376,7 +1376,7 @@ jobs: - name: Cancel workflow env: ARGO_TOKEN: ${{ steps.get-argo-token.outputs.argo-token }} - if: ${{ cancelled() }} || ${{ steps.is-pod-deleted.outcome }} != 'success' + if: ${{ cancelled() || steps.is-pod-deleted.outcome != 'success' }} run: | cancel_response=$(argo submit -v -o json --from wftmpl/${{ needs.setup.outputs.argo-cancel-workflow-tmpl-name }} -l workflows.argoproj.io/workflow-template=${{ needs.setup.outputs.argo-cancel-workflow-tmpl-name }} --argo-base-href '' -p workflow-to-cancel=${{ steps.run-tests.outputs.workflow-name }}) cancel_workflow_name=$( echo "$cancel_response" |jq -r '.metadata.name' ) @@ -1604,7 +1604,7 @@ jobs: - name: Cancel workflow env: ARGO_TOKEN: ${{ steps.get-argo-token.outputs.argo-token }} - if: ${{ cancelled() }} || ${{ steps.is-pod-deleted.outcome }} != 'success' + if: ${{ cancelled() || steps.is-pod-deleted.outcome != 'success' }} run: | cancel_response=$(argo submit -v -o json --from wftmpl/${{ needs.setup.outputs.argo-cancel-workflow-tmpl-name }} -l workflows.argoproj.io/workflow-template=${{ needs.setup.outputs.argo-cancel-workflow-tmpl-name }} --argo-base-href '' -p workflow-to-cancel=${{ steps.run-tests.outputs.workflow-name }}) cancel_workflow_name=$( echo "$cancel_response" |jq -r '.metadata.name' ) @@ -1845,7 +1845,7 @@ jobs: - name: Cancel workflow env: ARGO_TOKEN: ${{ steps.get-argo-token.outputs.argo-token }} - if: ${{ cancelled() }} || ${{ steps.is-pod-deleted.outcome }} != 'success' + if: ${{ cancelled() || steps.is-pod-deleted.outcome != 'success' }} run: | cancel_response=$(argo submit -v -o json --from wftmpl/${{ needs.setup.outputs.argo-cancel-workflow-tmpl-name }} -l workflows.argoproj.io/workflow-template=${{ needs.setup.outputs.argo-cancel-workflow-tmpl-name }} --argo-base-href '' -p workflow-to-cancel=${{ steps.run-tests.outputs.workflow-name }}) cancel_workflow_name=$( echo "$cancel_response" |jq -r '.metadata.name' ) @@ -2080,7 +2080,7 @@ jobs: - name: Cancel workflow env: ARGO_TOKEN: ${{ steps.get-argo-token.outputs.argo-token }} - if: ${{ cancelled() }} || ${{ steps.is-pod-deleted.outcome }} != 'success' + if: ${{ cancelled() || steps.is-pod-deleted.outcome != 'success' }} run: | cancel_response=$(argo submit -v -o json --from wftmpl/${{ needs.setup.outputs.argo-cancel-workflow-tmpl-name }} -l workflows.argoproj.io/workflow-template=${{ needs.setup.outputs.argo-cancel-workflow-tmpl-name }} --argo-base-href '' -p workflow-to-cancel=${{ steps.run-tests.outputs.workflow-name }}) cancel_workflow_name=$( echo "$cancel_response" |jq -r '.metadata.name' ) @@ -2308,7 +2308,7 @@ jobs: - name: Cancel workflow env: ARGO_TOKEN: ${{ steps.get-argo-token.outputs.argo-token }} - if: ${{ cancelled() }} || ${{ steps.is-pod-deleted.outcome }} != 'success' + if: ${{ cancelled() || steps.is-pod-deleted.outcome != 'success' }} run: | cancel_response=$(argo submit -v -o json --from wftmpl/${{ needs.setup.outputs.argo-cancel-workflow-tmpl-name }} -l workflows.argoproj.io/workflow-template=${{ needs.setup.outputs.argo-cancel-workflow-tmpl-name }} --argo-base-href '' -p workflow-to-cancel=${{ steps.run-tests.outputs.workflow-name }}) cancel_workflow_name=$( echo "$cancel_response" |jq -r '.metadata.name' )