Skip to content

Commit d59a65d

Browse files
authored
Merge pull request #791 from carterpewpew/fix-resource-cleanup
tests: fix Pipeline and DataVolume cleanup when namespace is unset
2 parents a26d813 + 3c17d37 commit d59a65d

File tree

1 file changed

+15
-3
lines changed

1 file changed

+15
-3
lines changed

test/framework/framework.go

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,15 +131,27 @@ func (f *Framework) ManagePipelineRuns(pipelineRuns ...*pipev1.PipelineRun) *Fra
131131
}
132132

133133
func (f *Framework) ManagePipelines(pipelines ...*pipev1.Pipeline) *Framework {
134-
f.managedResources.pipelines = append(f.managedResources.pipelines, pipelines...)
134+
for _, pipeline := range pipelines {
135+
if pipeline == nil || pipeline.Name == "" {
136+
continue
137+
}
138+
if pipeline.Namespace == "" {
139+
pipeline.Namespace = f.DeployNamespace
140+
}
141+
f.managedResources.pipelines = append(f.managedResources.pipelines, pipeline)
142+
}
135143
return f
136144
}
137145

138146
func (f *Framework) ManageDataVolumes(dataVolumes ...*cdiv1beta1.DataVolume) *Framework {
139147
for _, dataVolume := range dataVolumes {
140-
if dataVolume != nil && dataVolume.Name != "" && dataVolume.Namespace != "" {
141-
f.managedResources.dataVolumes = append(f.managedResources.dataVolumes, dataVolume)
148+
if dataVolume == nil || dataVolume.Name == "" {
149+
continue
150+
}
151+
if dataVolume.Namespace == "" {
152+
dataVolume.Namespace = f.DeployNamespace
142153
}
154+
f.managedResources.dataVolumes = append(f.managedResources.dataVolumes, dataVolume)
143155
}
144156
return f
145157
}

0 commit comments

Comments
 (0)