Skip to content
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

Restore results dependencies in v1 Pipeline #5424

Merged
merged 1 commit into from
Sep 2, 2022
Merged

Restore results dependencies in v1 Pipeline #5424

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
12 changes: 12 additions & 0 deletions pkg/apis/pipeline/v1/pipeline_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,6 +472,7 @@ func (pt PipelineTask) Validate(ctx context.Context) (errs *apis.FieldError) {
func (pt PipelineTask) Deps() []string {
deps := []string{}

deps = append(deps, pt.resultDeps()...)
deps = append(deps, pt.orderingDeps()...)

uniqueDeps := sets.NewString()
Expand All @@ -485,6 +486,17 @@ func (pt PipelineTask) Deps() []string {
return uniqueDeps.List()
}

func (pt PipelineTask) resultDeps() []string {
resultDeps := []string{}

// Add any dependents from result references.
for _, ref := range PipelineTaskResultRefs(&pt) {
resultDeps = append(resultDeps, ref.PipelineTask)
}

return resultDeps
}

func (pt PipelineTask) orderingDeps() []string {
orderingDeps := []string{}
for _, runAfter := range pt.RunAfter {
Expand Down
170 changes: 170 additions & 0 deletions pkg/apis/pipeline/v1/pipeline_types_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,176 @@ func TestPipelineTaskList_Deps(t *testing.T) {
expectedDeps: map[string][]string{
"task-2": {"task-1"},
},
}, {
name: "valid pipeline with Task Results deps",
tasks: []PipelineTask{{
Name: "task-1",
}, {
Name: "task-2",
Params: []Param{{
Value: ParamValue{
Type: "string",
StringVal: "$(tasks.task-1.results.result)",
}},
}},
},
expectedDeps: map[string][]string{
"task-2": {"task-1"},
},
}, {
name: "valid pipeline with Task Results in Matrix deps",
tasks: []PipelineTask{{
Name: "task-1",
}, {
Name: "task-2",
Matrix: []Param{{
Value: ParamValue{
Type: ParamTypeArray,
ArrayVal: []string{
"$(tasks.task-1.results.result)",
},
}},
}},
},
expectedDeps: map[string][]string{
"task-2": {"task-1"},
},
}, {
name: "valid pipeline with When Expressions deps",
tasks: []PipelineTask{{
Name: "task-1",
}, {
Name: "task-2",
When: WhenExpressions{{
Input: "$(tasks.task-1.results.result)",
Operator: "in",
Values: []string{"foo"},
}},
}},
expectedDeps: map[string][]string{
"task-2": {"task-1"},
},
}, {
name: "valid pipeline with ordering deps and resource deps",
tasks: []PipelineTask{{
Name: "task-1",
}, {
Name: "task-2", RunAfter: []string{"task-1"},
}, {
Name: "task-3",
RunAfter: []string{"task-1"},
}, {
Name: "task-4",
RunAfter: []string{"task-1"},
Params: []Param{{
Value: ParamValue{
Type: "string",
StringVal: "$(tasks.task-3.results.result)",
}},
},
}, {
Name: "task-5",
RunAfter: []string{"task-1"},
When: WhenExpressions{{
Input: "$(tasks.task-4.results.result)",
Operator: "in",
Values: []string{"foo"},
}},
}, {
Name: "task-6",
RunAfter: []string{"task-1"},
Matrix: []Param{{
Value: ParamValue{
Type: ParamTypeArray,
ArrayVal: []string{
"$(tasks.task-2.results.result)",
"$(tasks.task-5.results.result)",
},
}},
},
}},
expectedDeps: map[string][]string{
"task-2": {"task-1"},
"task-3": {"task-1"},
"task-4": {"task-1", "task-3"},
"task-5": {"task-1", "task-4"},
"task-6": {"task-1", "task-2", "task-5"},
},
}, {
name: "valid pipeline with ordering deps and resource deps - verify unique dependencies",
tasks: []PipelineTask{{
Name: "task-1",
}, {
Name: "task-2", RunAfter: []string{"task-1"},
}, {
Name: "task-3",
RunAfter: []string{"task-1"},
}, {
Name: "task-4",
RunAfter: []string{"task-1", "task-3"},
Params: []Param{{
Value: ParamValue{
Type: "string",
StringVal: "$(tasks.task-2.results.result)",
}}, {
Value: ParamValue{
Type: "string",
StringVal: "$(tasks.task-3.results.result)",
}},
},
}, {
Name: "task-5",
RunAfter: []string{"task-1", "task-2", "task-3", "task-4"},
Params: []Param{{
Value: ParamValue{
Type: "string",
StringVal: "$(tasks.task-4.results.result)",
}},
},
When: WhenExpressions{{
Input: "$(tasks.task-3.results.result)",
Operator: "in",
Values: []string{"foo"},
}, {
Input: "$(tasks.task-4.results.result)",
Operator: "in",
Values: []string{"foo"},
}},
}, {
Name: "task-6",
RunAfter: []string{"task-1", "task-2", "task-3", "task-4", "task-5"},
Params: []Param{{
Value: ParamValue{
Type: "string",
StringVal: "$(tasks.task-4.results.result)",
}},
},
When: WhenExpressions{{
Input: "$(tasks.task-3.results.result)",
Operator: "in",
Values: []string{"foo"},
}, {
Input: "$(tasks.task-4.results.result)",
Operator: "in",
Values: []string{"foo"},
}},
Matrix: []Param{{
Value: ParamValue{
Type: ParamTypeArray,
ArrayVal: []string{
"$(tasks.task-2.results.result)",
"$(tasks.task-5.results.result)",
},
}},
},
}},
expectedDeps: map[string][]string{
"task-2": {"task-1"},
"task-3": {"task-1"},
"task-4": {"task-1", "task-2", "task-3"},
"task-5": {"task-1", "task-2", "task-3", "task-4"},
"task-6": {"task-1", "task-2", "task-3", "task-4", "task-5"},
},
}}
for _, tc := range pipelines {
t.Run(tc.name, func(t *testing.T) {
Expand Down