fix(pipelinetemplate): Ensure pipelines are executed on v2 (#1227)

spinnaker · Mar 14, 2017 · af05eec · af05eec
1 parent b448901
commit af05eec
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/...java/com/netflix/spinnaker/orca/pipelinetemplate/v1schema/V1SchemaExecutionGenerator.java b/...java/com/netflix/spinnaker/orca/pipelinetemplate/v1schema/V1SchemaExecutionGenerator.java
@@ -34,13 +34,10 @@ public class V1SchemaExecutionGenerator implements ExecutionGenerator {
   @Override
   public Map<String, Object> generate(PipelineTemplate template, TemplateConfiguration configuration) {
     Map<String, Object> pipeline = new HashMap<>();
-    pipeline.put("id", configuration.getRuntimeId());
+    pipeline.put("id", Optional.ofNullable(configuration.getPipeline().getPipelineConfigId()).orElse(configuration.getRuntimeId()));
     pipeline.put("application", configuration.getPipeline().getApplication());
     pipeline.put("name", Optional.ofNullable(configuration.getPipeline().getName()).orElse("Unnamed Execution"));
-
-    if (configuration.getPipeline().getPipelineConfigId() != null) {
-      pipeline.put("pipelineConfigId", configuration.getPipeline().getPipelineConfigId());
-    }
+    pipeline.put("executionEngine", configuration.getPipeline().getExecutionEngine());
 
     // TODO rz - Ehhhh
     Configuration c = template.getConfiguration();

diff --git a/...ava/com/netflix/spinnaker/orca/pipelinetemplate/v1schema/model/TemplateConfiguration.java b/...ava/com/netflix/spinnaker/orca/pipelinetemplate/v1schema/model/TemplateConfiguration.java
@@ -39,6 +39,7 @@ public static class PipelineDefinition {
 
     private String application;
     private String pipelineConfigId;
+    private String executionEngine = "v2";
     private String name;
     private TemplateSource template;
     private Map<String, Object> variables = new HashMap<>();
@@ -82,6 +83,10 @@ public Map<String, Object> getVariables() {
     public void setVariables(Map<String, Object> variables) {
       this.variables = variables;
     }
+
+    public String getExecutionEngine() {
+      return executionEngine;
+    }
   }
 
   public static class TemplateSource {

diff --git a/...m/netflix/spinnaker/orca/pipelinetemplate/PipelineTemplatePipelinePreprocessorSpec.groovy b/...m/netflix/spinnaker/orca/pipelinetemplate/PipelineTemplatePipelinePreprocessorSpec.groovy
@@ -81,6 +81,7 @@ class PipelineTemplatePipelinePreprocessorSpec extends Specification {
     then:
     def expected = [
       id: null,
+      executionEngine: 'v2',
       application: 'myapp',
       name: 'Unnamed Execution',
       keepWaitingPipelines: false,