From 3f9e6144a5740821b48291535782759a90a7f8e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Wed, 24 Apr 2024 14:23:26 +0200 Subject: [PATCH] fix --- .../tekton.dev_v1_Pipeline_auto-ci-push.yaml | 25 ++++----- .../tekton.dev_v1_Pipeline_auto-ci-tag.yaml | 56 ++++++++++++------- 2 files changed, 48 insertions(+), 33 deletions(-) diff --git a/share/gitea-tekton-org/tekton.dev_v1_Pipeline_auto-ci-push.yaml b/share/gitea-tekton-org/tekton.dev_v1_Pipeline_auto-ci-push.yaml index 06bc26b..569c866 100644 --- a/share/gitea-tekton-org/tekton.dev_v1_Pipeline_auto-ci-push.yaml +++ b/share/gitea-tekton-org/tekton.dev_v1_Pipeline_auto-ci-push.yaml @@ -31,9 +31,6 @@ spec: type: string - name: branch-name type: string - - name: on-error - type: string - default: continue finally: - name: cleanup taskRef: @@ -148,7 +145,7 @@ spec: workspaces: - name: source - name: lint-shell - onError: $(params.on-error) + onError: continue when: - input: "lint-shell" operator: in @@ -162,7 +159,7 @@ spec: - name: shared-workspace workspace: source - name: lint-shell-custom - onError: $(params.on-error) + onError: continue when: - input: "lint-shell-custom" operator: in @@ -183,7 +180,7 @@ spec: - name: shared-workspace workspace: source - name: lint-docker - onError: $(params.on-error) + onError: continue when: - input: "lint-docker" operator: in @@ -197,7 +194,7 @@ spec: workspaces: - name: source - name: lint-docker-custom - onError: $(params.on-error) + onError: continue when: - input: "lint-docker-custom" operator: in @@ -218,7 +215,7 @@ spec: workspaces: - name: source - name: lint-yaml - onError: $(params.on-error) + onError: continue when: - input: "lint-yaml" operator: in @@ -232,7 +229,7 @@ spec: - name: shared-workspace workspace: source - name: lint-yaml-custom - onError: $(params.on-error) + onError: continue when: - input: "lint-yaml-custom" operator: in @@ -253,7 +250,7 @@ spec: - name: shared-workspace workspace: source - name: lint-black - onError: $(params.on-error) + onError: continue when: - input: "lint-black" operator: in @@ -267,7 +264,7 @@ spec: - name: shared-workspace workspace: source - name: lint-black-custom - onError: $(params.on-error) + onError: continue when: - input: "lint-black-custom" operator: in @@ -288,7 +285,7 @@ spec: - name: shared-workspace workspace: source - name: lint-python - onError: $(params.on-error) + onError: continue when: - input: "lint-python" operator: in @@ -302,7 +299,7 @@ spec: - name: shared-workspace workspace: source - name: lint-python-custom - onError: $(params.on-error) + onError: continue when: - input: "lint-python" operator: in @@ -323,7 +320,7 @@ spec: - name: shared-workspace workspace: source - name: lint-custom - onError: $(params.on-error) + onError: continue when: - input: "lint-custom" operator: in diff --git a/share/gitea-tekton-org/tekton.dev_v1_Pipeline_auto-ci-tag.yaml b/share/gitea-tekton-org/tekton.dev_v1_Pipeline_auto-ci-tag.yaml index 0b9f9f2..06eb352 100644 --- a/share/gitea-tekton-org/tekton.dev_v1_Pipeline_auto-ci-tag.yaml +++ b/share/gitea-tekton-org/tekton.dev_v1_Pipeline_auto-ci-tag.yaml @@ -28,9 +28,6 @@ spec: type: string - name: tag-name type: string - - name: on-error - type: string - default: stopAndFail finally: - name: cleanup taskRef: @@ -132,28 +129,28 @@ spec: workspaces: - name: source - name: lint-shell - onError: $(params.on-error) + onError: stopAndFail when: - input: "lint-shell" operator: in values: ["$(params.stages[*])"] params: - name: args - value: $(params.shellcheck-args) + value: $(tasks.detect-stages.results.shellcheck-args) taskRef: name: shellcheck workspaces: - name: shared-workspace workspace: source - name: lint-shell-custom - onError: $(params.on-error) + onError: stopAndFail when: - input: "lint-shell-custom" operator: in values: ["$(params.stages[*])"] params: - name: args - value: $(params.shellcheck-args) + value: $(tasks.detect-stages.results.shellcheck-args) taskRef: resolver: git params: @@ -167,7 +164,7 @@ spec: - name: shared-workspace workspace: source - name: lint-docker - onError: $(params.on-error) + onError: stopAndFail when: - input: "lint-docker" operator: in @@ -181,7 +178,7 @@ spec: workspaces: - name: source - name: lint-docker-custom - onError: $(params.on-error) + onError: stopAndFail when: - input: "lint-docker-custom" operator: in @@ -202,7 +199,7 @@ spec: workspaces: - name: source - name: lint-yaml - onError: $(params.on-error) + onError: stopAndFail when: - input: "lint-yaml" operator: in @@ -216,7 +213,7 @@ spec: - name: shared-workspace workspace: source - name: lint-yaml-custom - onError: $(params.on-error) + onError: stopAndFail when: - input: "lint-yaml-custom" operator: in @@ -237,28 +234,28 @@ spec: - name: shared-workspace workspace: source - name: lint-black - onError: $(params.on-error) + onError: stopAndFail when: - input: "lint-black" operator: in values: ["$(params.stages[*])"] params: - name: args - value: $(params.black-args) + value: $(tasks.detect-stages.results.black-args) taskRef: name: black workspaces: - name: shared-workspace workspace: source - name: lint-black-custom - onError: $(params.on-error) + onError: stopAndFail when: - input: "lint-black-custom" operator: in values: ["$(params.stages[*])"] params: - name: args - value: $(params.black-args) + value: $(tasks.detect-stages.results.black-args) taskRef: resolver: git params: @@ -272,21 +269,42 @@ spec: - name: shared-workspace workspace: source - name: lint-python - onError: $(params.on-error) + onError: stopAndFail when: - input: "lint-python" operator: in values: ["$(params.stages[*])"] params: - name: args - value: ["$(tasks.detect-stages.results.file-python[*])"] + value: $(tasks.detect-stages.results.pylint-args) taskRef: name: pylint workspaces: - name: shared-workspace workspace: source + - name: lint-python-custom + onError: stopAndFail + when: + - input: "lint-python" + operator: in + values: ["$(params.stages[*])"] + params: + - name: args + value: $(tasks.detect-stages.results.pylint-args) + taskRef: + resolver: git + params: + - name: url + value: $(params.git-url) + - name: revision + value: $(params.git-revision) + - name: pathInRepo + value: ".tekton/lint-python.yaml" + workspaces: + - name: shared-workspace + workspace: source - name: lint-custom - onError: $(params.on-error) + onError: stopAndFail when: - input: "lint-custom" operator: in @@ -303,7 +321,7 @@ spec: workspaces: - name: source - name: publish-docker - runAfter: ["lint-docker"] + runAfter: ["lint-shell","lint-shell-custom","lint-docker","lint-docker-custom","lint-yaml","lint-yaml-custom","lint-black","lint-black-custom","lint-python","lint-python-custom","lint-custom"] when: - input: "publish-docker" operator: in