From 5f64b1e9636e33d229142876db356d0003b77a13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Tue, 23 Apr 2024 11:06:43 +0200 Subject: [PATCH] fix --- share/gitea-tekton-org/auto-ci.tf | 9 +++++++-- .../tekton.dev_v1_Task_auto-ci-cleanup.yaml | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/share/gitea-tekton-org/auto-ci.tf b/share/gitea-tekton-org/auto-ci.tf index c1bc9e1..89a4d62 100644 --- a/share/gitea-tekton-org/auto-ci.tf +++ b/share/gitea-tekton-org/auto-ci.tf @@ -144,7 +144,7 @@ resource "kubectl_manifest" "ci-trigger-push" { - name: source persistentVolumeClaim: claimName: source - subPath: "$(extensions.git-revision)" + subPath: $(tt.params.git-revision) - name: dockerconfig secret: secretName: gitea-docker @@ -189,6 +189,8 @@ resource "kubectl_manifest" "ci-trigger-tag" { value: "$(extensions.project-path)" - name: git-repository-url value: "$(extensions.git-repository-url)" + - name: git-revision + value: "$(extensions.git-revision)" - name: tag-name value: $(extensions.tag-name) template: @@ -202,6 +204,9 @@ resource "kubectl_manifest" "ci-trigger-tag" { description: The path of the current project - name: git-repository-url description: The git repository url + - name: git-revision + description: The git revision + default: main - name: tag-name description: The git tag resourcetemplates: @@ -233,7 +238,7 @@ resource "kubectl_manifest" "ci-trigger-tag" { - name: source persistentVolumeClaim: claimName: source - subPath: "$(extensions.git-revision)" + subPath: $(tt.params.git-revision) - name: dockerconfig secret: secretName: gitea-docker diff --git a/share/gitea-tekton-org/tekton.dev_v1_Task_auto-ci-cleanup.yaml b/share/gitea-tekton-org/tekton.dev_v1_Task_auto-ci-cleanup.yaml index 8a3846f..5076bf5 100644 --- a/share/gitea-tekton-org/tekton.dev_v1_Task_auto-ci-cleanup.yaml +++ b/share/gitea-tekton-org/tekton.dev_v1_Task_auto-ci-cleanup.yaml @@ -14,7 +14,7 @@ spec: workingDir: $(workspaces.source.path) script: |- #!/usr/bin/env bash - rm -rf . || true + rm -rf .* * || true workspaces: - name: source mountPath: /data \ No newline at end of file