diff --git a/pkg/pipelines/tekton/templates.go b/pkg/pipelines/tekton/templates.go index 77b215bc7..6a156845c 100644 --- a/pkg/pipelines/tekton/templates.go +++ b/pkg/pipelines/tekton/templates.go @@ -27,6 +27,9 @@ const ( // S2I related properties defaultS2iImageScriptsUrl = "image:///usr/libexec/s2i" quarkusS2iImageScriptsUrl = "image:///usr/local/s2i" + + // The branch or tag we are targeting with Pipelines (ie: main, refs/tags/*) + defaultPipelinesTargetBranch = "main" ) type templateData struct { @@ -44,6 +47,9 @@ type templateData struct { PvcName string SecretName string + // The branch or tag we are targeting with Pipelines (ie: main, refs/tags/*) + PipelinesTargetBranch string + // Static entries RepoUrl string Revision string @@ -85,6 +91,11 @@ func createPipelineRunTemplate(f fn.Function) error { contextDir = "." } + pipelinesTargetBranch := f.Build.Git.Revision + if pipelinesTargetBranch == "" { + pipelinesTargetBranch = defaultPipelinesTargetBranch + } + buildEnvs := []string{} if len(f.Build.BuildEnvs) == 0 { buildEnvs = []string{"="} @@ -114,6 +125,8 @@ func createPipelineRunTemplate(f fn.Function) error { PvcName: getPipelinePvcName(f), SecretName: getPipelineSecretName(f), + PipelinesTargetBranch: pipelinesTargetBranch, + GitCloneTaskRef: taskGitCloneRef, FuncBuildpacksTaskRef: taskFuncBuildpacksRef, FuncS2iTaskRef: taskFuncS2iRef, diff --git a/pkg/pipelines/tekton/templates_pack.go b/pkg/pipelines/tekton/templates_pack.go index 0a21d804a..8afb3392f 100644 --- a/pkg/pipelines/tekton/templates_pack.go +++ b/pkg/pipelines/tekton/templates_pack.go @@ -114,7 +114,7 @@ metadata: pipelinesascode.tekton.dev/on-event: "[push]" # The branch or tag we are targeting (ie: main, refs/tags/*) - pipelinesascode.tekton.dev/on-target-branch: "[main]" + pipelinesascode.tekton.dev/on-target-branch: "[{{.PipelinesTargetBranch}}]" # Fetch the git-clone task from hub pipelinesascode.tekton.dev/task: {{.GitCloneTaskRef}} diff --git a/pkg/pipelines/tekton/templates_s2i.go b/pkg/pipelines/tekton/templates_s2i.go index f44999769..875d043a9 100644 --- a/pkg/pipelines/tekton/templates_s2i.go +++ b/pkg/pipelines/tekton/templates_s2i.go @@ -122,7 +122,7 @@ metadata: pipelinesascode.tekton.dev/on-event: "[push]" # The branch or tag we are targeting (ie: main, refs/tags/*) - pipelinesascode.tekton.dev/on-target-branch: "[main]" + pipelinesascode.tekton.dev/on-target-branch: "[{{.PipelinesTargetBranch}}]" # Fetch the git-clone task from hub pipelinesascode.tekton.dev/task: {{.GitCloneTaskRef}}