feat(RHTAPREL-790): pass taskGitRevision param to plr

If a git resolver is used in the RPA, pass the revision value from it to the release pipelineRun as the taskGitRevision parameter. Signed-off-by: Johnny Bieren <[email protected]>
konflux-ci · Jan 8, 2024 · 4a53fb0 · 4a53fb0
1 parent ff16ae4
commit 4a53fb0
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 8 deletions.
diff --git a/controllers/release/adapter.go b/controllers/release/adapter.go
@@ -345,6 +345,7 @@ func (a *adapter) createManagedPipelineRun(resources *loader.ProcessingResources
 		WithServiceAccount(resources.ReleasePlanAdmission.Spec.ServiceAccount).
 		WithTimeout(resources.ReleasePlanAdmission.Spec.PipelineRef.Timeout).
 		WithPipelineRef(resources.ReleasePlanAdmission.Spec.PipelineRef.ToTektonPipelineRef()).
+		WithTaskGitRevisionParameter(resources.ReleasePlanAdmission.Spec.PipelineRef.ToTektonPipelineRef()).
 		WithEnterpriseContractConfigMap(resources.EnterpriseContractConfigMap).
 		WithEnterpriseContractPolicy(resources.EnterpriseContractPolicy).
 		AsPipelineRun()

diff --git a/controllers/release/adapter_test.go b/controllers/release/adapter_test.go
@@ -872,14 +872,26 @@ var _ = Describe("Release adapter", Ordered, func() {
 		})
 
 		It("references the pipeline specified in the ReleasePlanAdmission", func() {
-			var pipelineName string
+			var pipelineUrl string
 			resolverParams := pipelineRun.Spec.PipelineRef.ResolverRef.Params
 			for i := range resolverParams {
-				if resolverParams[i].Name == "name" {
-					pipelineName = resolverParams[i].Value.StringVal
+				if resolverParams[i].Name == "url" {
+					pipelineUrl = resolverParams[i].Value.StringVal
 				}
 			}
-			Expect(pipelineName).To(Equal(releasePlanAdmission.Spec.PipelineRef.Params[1].Value))
+			Expect(pipelineUrl).To(Equal(releasePlanAdmission.Spec.PipelineRef.Params[0].Value))
+		})
+
+		It("contains a parameter with the taskGitRevision", func() {
+			Expect(pipelineRun.Spec.Params).Should(ContainElement(HaveField("Name", "taskGitRevision")))
+			var revision string
+			resolverParams := pipelineRun.Spec.PipelineRef.ResolverRef.Params
+			for i := range resolverParams {
+				if resolverParams[i].Name == "revision" {
+					revision = resolverParams[i].Value.StringVal
+				}
+			}
+			Expect(pipelineRun.Spec.Params).Should(ContainElement(HaveField("Value.StringVal", revision)))
 		})
 
 		It("contains the proper timeout value", func() {
@@ -1689,11 +1701,11 @@ var _ = Describe("Release adapter", Ordered, func() {
 				Origin:       "default",
 				Environment:  environment.Name,
 				PipelineRef: &tektonutils.PipelineRef{
-					Resolver: "bundles",
+					Resolver: "git",
 					Params: []tektonutils.Param{
-						{Name: "bundle", Value: "quay.io/some/bundle"},
-						{Name: "name", Value: "release-pipeline"},
-						{Name: "kind", Value: "pipeline"},
+						{Name: "url", Value: "my-url"},
+						{Name: "revision", Value: "my-revision"},
+						{Name: "pathInRepo", Value: "my-path"},
 					},
 					Timeout: "2h0m0s",
 				},

diff --git a/tekton/pipeline_run.go b/tekton/pipeline_run.go
@@ -163,6 +163,21 @@ func (r *ReleasePipelineRun) WithServiceAccount(serviceAccount string) *ReleaseP
 	return r
 }
 
+// WithTaskGitRevisionParameter adds the taskGitRevision parameter to the managed Release PipelineRun with the value of the revision
+// from the pipelineRef.
+func (r *ReleasePipelineRun) WithTaskGitRevisionParameter(pipelineRef *tektonv1.PipelineRef) *ReleasePipelineRun {
+	for _, p := range pipelineRef.Params {
+		if p.Name == "revision" {
+			r.WithExtraParam("taskGitRevision", tektonv1.ParamValue{
+				Type:      tektonv1.ParamTypeString,
+				StringVal: p.Value.StringVal,
+			})
+		}
+	}
+
+	return r
+}
+
 // WithTimeout overwrites the PipelineRun's default timeout value.
 func (r *ReleasePipelineRun) WithTimeout(timeout string) *ReleasePipelineRun {
 	duration, err := time.ParseDuration(timeout)

diff --git a/tekton/pipeline_run_test.go b/tekton/pipeline_run_test.go
@@ -212,6 +212,25 @@ var _ = Describe("PipelineRun", func() {
 			Expect(releasePipelineRun.Spec.TaskRunTemplate.ServiceAccountName).To(Equal(serviceAccountName))
 		})
 
+		It("can add the taskGitRevision parameter to the PipelineRun object ", func() {
+			pipelineRef := &tektonv1.PipelineRef{
+				ResolverRef: tektonv1.ResolverRef{
+					Params: []tektonv1.Param{
+						{
+							Name: "revision",
+							Value: tektonv1.ParamValue{
+								Type:      tektonv1.ParamTypeString,
+								StringVal: "my-revision",
+							},
+						},
+					},
+				},
+			}
+			releasePipelineRun.WithTaskGitRevisionParameter(pipelineRef)
+			Expect(releasePipelineRun.Spec.Params[0].Name).To(Equal("taskGitRevision"))
+			Expect(releasePipelineRun.Spec.Params[0].Value.StringVal).To(Equal("my-revision"))
+		})
+
 		It("can add the timeout that should be used", func() {
 			releasePipelineRun.WithTimeout(timeout)
 			Expect(releasePipelineRun.Spec.Timeouts.Pipeline.Duration.String()).To(Equal(timeout))