Skip to content

variable substitution in finally section #2908

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 7, 2020
Merged

variable substitution in finally section #2908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion pkg/reconciler/pipelinerun/resources/apply.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ func ApplyTaskResults(targets PipelineRunState, resolvedResultRefs ResolvedResul
func ApplyReplacements(p *v1beta1.PipelineSpec, replacements map[string]string, arrayReplacements map[string][]string) *v1beta1.PipelineSpec {
p = p.DeepCopy()

tasks := p.Tasks
// replace param values for both DAG and final tasks
tasks := append(p.Tasks, p.Finally...)

for i := range tasks {
tasks[i].Params = replaceParamValues(tasks[i].Params, replacements, arrayReplacements)
Expand Down
21 changes: 21 additions & 0 deletions pkg/reconciler/pipelinerun/resources/apply_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,27 @@ func TestApplyParameters(t *testing.T) {
tb.PipelineTaskParam("first-task-third-param", "static value"),
tb.PipelineTaskParam("first-task-fourth-param", "first", "fourth-value", "array"),
))),
}, {
name: "parameter evaluation with final tasks",
original: tb.Pipeline("test-pipeline",
tb.PipelineSpec(
tb.PipelineParamSpec("first-param", v1beta1.ParamTypeString, tb.ParamSpecDefault("default-value")),
tb.PipelineParamSpec("second-param", v1beta1.ParamTypeString),
tb.FinalPipelineTask("final-task-1", "final-task",
tb.PipelineTaskParam("final-task-first-param", "$(params.first-param)"),
tb.PipelineTaskParam("final-task-second-param", "$(params.second-param)"),
))),
run: tb.PipelineRun("test-pipeline-run",
tb.PipelineRunSpec("test-pipeline",
tb.PipelineRunParam("second-param", "second-value"))),
expected: tb.Pipeline("test-pipeline",
tb.PipelineSpec(
tb.PipelineParamSpec("first-param", v1beta1.ParamTypeString, tb.ParamSpecDefault("default-value")),
tb.PipelineParamSpec("second-param", v1beta1.ParamTypeString),
tb.FinalPipelineTask("final-task-1", "final-task",
tb.PipelineTaskParam("final-task-first-param", "default-value"),
tb.PipelineTaskParam("final-task-second-param", "second-value"),
))),
}}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
Expand Down