fix(pipeline_template): Resave all pipelines on template update (#1766)

spinnaker · Nov 2, 2017 · 3476e5e · 3476e5e
1 parent 5fefb46
commit 3476e5e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/...ava/com/netflix/spinnaker/orca/pipelinetemplate/pipeline/UpdatePipelineTemplateStage.java b/...ava/com/netflix/spinnaker/orca/pipelinetemplate/pipeline/UpdatePipelineTemplateStage.java
@@ -27,7 +27,6 @@
 import com.netflix.spinnaker.orca.pipelinetemplate.tasks.PlanTemplateDependentsTask;
 import com.netflix.spinnaker.orca.pipelinetemplate.tasks.UpdatePipelineTemplateTask;
 import com.netflix.spinnaker.orca.pipelinetemplate.v1schema.model.PipelineTemplate;
-import com.netflix.spinnaker.orca.pipelinetemplate.v1schema.model.TemplateConfiguration;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -85,11 +84,6 @@ public <T extends Execution<T>> List<Stage<T>> aroundStages(@Nonnull Stage<T> st
     List<Map<String, Object>> dependentPipelines = front50Service.getPipelineTemplateDependents(pipelineTemplate.getId(), true);
 
     return dependentPipelines.stream()
-      .filter(pipeline -> {
-        // We only need to re-save pipelines that actually inherit configurations.
-        TemplateConfiguration config = pipelineTemplateObjectMapper.convertValue(pipeline.get("config"), TemplateConfiguration.class);
-        return !config.getConfiguration().getInherit().isEmpty();
-      })
       .map(pipeline -> configureSavePipelineStage(stage, pipeline))
       .collect(Collectors.toList());
   }

diff --git a/...m/netflix/spinnaker/orca/pipelinetemplate/pipeline/UpdatePipelineTemplateStageSpec.groovy b/...m/netflix/spinnaker/orca/pipelinetemplate/pipeline/UpdatePipelineTemplateStageSpec.groovy
@@ -94,8 +94,7 @@ class UpdatePipelineTemplateStageSpec extends Specification {
       [pipeline1, pipeline2, pipeline3]
     }
 
-    afterStages.size() == 2
-    afterStages*.name == ['updateDependentPipeline', 'updateDependentPipeline']
+    afterStages.size() == 3
     beforeStages.size() == 0
   }
 }