From 4e6095aae97d28d87ff087cb3aefa9dce07c512e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Huss?= <sebastien.huss@gmail.com>
Date: Tue, 23 Apr 2024 13:16:04 +0200
Subject: [PATCH] fix

---
 share/gitea-tekton-org/auto-ci.tf | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/share/gitea-tekton-org/auto-ci.tf b/share/gitea-tekton-org/auto-ci.tf
index 97fd92d..78fcf86 100644
--- a/share/gitea-tekton-org/auto-ci.tf
+++ b/share/gitea-tekton-org/auto-ci.tf
@@ -93,8 +93,8 @@ resource "kubectl_manifest" "ci-trigger-push" {
         value: "$(extensions.git-revision)"
       - name: git-default-branch
         value: "$(extensions.git-default-branch)"
-      - name: branch-name
-        value: $(extensions.branch-name)
+      - name: generate-name
+        value: "$(extensions.project-name.replace('_','-').replace('/','-'))-push-$(extensions.branch-name.replace('_','-').replace('/','-'))"
       template:
         spec:
           params:
@@ -115,11 +115,15 @@ resource "kubectl_manifest" "ci-trigger-push" {
           - name: branch-name
             description: The git branch
             default: main
+          - name: branch-name
+            description: The git branch
+            default: main
+          - name: generate-name
           resourcetemplates:
           - apiVersion: tekton.dev/v1beta1
             kind: PipelineRun
             metadata:
-              generateName: $(tt.params.project-name.replace('_','-').replace('/','-'))-push-$(tt.params.branch-name.replace('_','-').replace('/','-'))-
+              generateName: $(tt.params.generate-name)-
               annotations:
                 "mayfly.cloud.namecheap.com/expire": "336h" # 2 weeks
             spec:
@@ -193,6 +197,8 @@ resource "kubectl_manifest" "ci-trigger-tag" {
           value: "$(extensions.git-revision)"
         - name: tag-name
           value: $(extensions.tag-name)
+      - name: generate-name
+        value: "$(extensions.project-name.replace('_','-').replace('/','-'))-tag-$(extensions.tag-name.replace('_','-').replace('/','-'))"
       template:
         spec:
           params:
@@ -209,11 +215,12 @@ resource "kubectl_manifest" "ci-trigger-tag" {
             default: main
           - name: tag-name
             description: The git tag
+          - name: generate-name
           resourcetemplates:
           - apiVersion: tekton.dev/v1beta1
             kind: PipelineRun
             metadata:
-              generateName: $(tt.params.project-name.replace('_','-').replace('/','-'))-tag-$(tt.params.tag-name.replace('_','-').replace('/','-'))-
+              generateName: $(tt.params.generate-name)-
               annotations:
                 "mayfly.cloud.namecheap.com/expire": "1440h" # 2 months
             spec: