fix(core): handle incoming non-parallelized pipelines

spinnaker · Aug 30, 2017 · d541815 · d541815
1 parent 4569b5d
commit d541815
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 20 deletions.
diff --git a/orca-loadtest/src/main/resources/request-bodies/wait.json b/orca-loadtest/src/main/resources/request-bodies/wait.json
@@ -11,7 +11,6 @@
     }
   ],
   "limitConcurrent": true,
-  "parallel": true,
   "appConfig": {},
   "executionEngine": "v3"
 }
diff --git a/...java/com/netflix/spinnaker/orca/pipelinetemplate/v1schema/V1SchemaExecutionGenerator.java b/...java/com/netflix/spinnaker/orca/pipelinetemplate/v1schema/V1SchemaExecutionGenerator.java
@@ -15,18 +15,13 @@
  */
 package com.netflix.spinnaker.orca.pipelinetemplate.v1schema;
 
+import java.util.*;
+import java.util.stream.Collectors;
 import com.netflix.spinnaker.orca.pipelinetemplate.generator.ExecutionGenerator;
 import com.netflix.spinnaker.orca.pipelinetemplate.v1schema.model.PipelineTemplate;
 import com.netflix.spinnaker.orca.pipelinetemplate.v1schema.model.PipelineTemplate.Configuration;
 import com.netflix.spinnaker.orca.pipelinetemplate.v1schema.model.TemplateConfiguration;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-import java.util.UUID;
-import java.util.stream.Collectors;
-
 public class V1SchemaExecutionGenerator implements ExecutionGenerator {
 
   @Override
@@ -43,11 +38,9 @@ public Map<String, Object> generate(PipelineTemplate template, TemplateConfigura
     // TODO rz - Ehhhh
     Configuration c = template.getConfiguration();
     if (template.getConfiguration() == null) {
-      pipeline.put("parallel", true);
       pipeline.put("limitConcurrent", true);
       pipeline.put("keepWaitingPipelines", false);
     } else {
-      pipeline.put("parallel", c.getConcurrentExecutions().getOrDefault("parallel", true));
       pipeline.put("limitConcurrent", c.getConcurrentExecutions().getOrDefault("limitConcurrent", true));
       pipeline.put("keepWaitingPipelines", c.getConcurrentExecutions().getOrDefault("keepWaitingPipelines", false));
     }

diff --git a/...m/netflix/spinnaker/orca/pipelinetemplate/PipelineTemplatePipelinePreprocessorSpec.groovy b/...m/netflix/spinnaker/orca/pipelinetemplate/PipelineTemplatePipelinePreprocessorSpec.groovy
@@ -33,7 +33,6 @@ import org.yaml.snakeyaml.Yaml
 import spock.lang.Specification
 import spock.lang.Subject
 import spock.lang.Unroll
-
 import static org.unitils.reflectionassert.ReflectionAssert.assertReflectionEquals
 
 class PipelineTemplatePipelinePreprocessorSpec extends Specification {
@@ -110,7 +109,6 @@ class PipelineTemplatePipelinePreprocessorSpec extends Specification {
       name: 'Unnamed Execution',
       keepWaitingPipelines: false,
       limitConcurrent: true,
-      parallel: true,
       notifications: [],
       stages: [
         [

diff --git a/...netflix/spinnaker/orca/pipelinetemplate/v1schema/TemplatedPipelineModelMutatorSpec.groovy b/...netflix/spinnaker/orca/pipelinetemplate/v1schema/TemplatedPipelineModelMutatorSpec.groovy
@@ -111,7 +111,6 @@ class TemplatedPipelineModelMutatorSpec extends Specification {
       )
     )]}
     pipeline.triggers.size() == 1
-    pipeline.parallel == null
     pipeline.parameters == null
   }
 

diff --git a/...om/netflix/spinnaker/orca/pipelinetemplate/v1schema/V1SchemaExecutionGeneratorSpec.groovy b/...om/netflix/spinnaker/orca/pipelinetemplate/v1schema/V1SchemaExecutionGeneratorSpec.groovy
@@ -51,7 +51,6 @@ class V1SchemaExecutionGeneratorSpec extends Specification {
     result.id != null
     result.application == 'orca'
     result.name == 'My Template'
-    result.parallel == true
     result.limitConcurrent == true
     result.keepWaitingPipelines == false
     result.stages*.type == ['bake', 'tagImage']

diff --git a/orca-web/src/main/groovy/com/netflix/spinnaker/orca/controllers/OperationsController.groovy b/orca-web/src/main/groovy/com/netflix/spinnaker/orca/controllers/OperationsController.groovy
@@ -16,6 +16,7 @@
 
 package com.netflix.spinnaker.orca.controllers
 
+import javax.servlet.http.HttpServletResponse
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.netflix.spinnaker.kork.web.exceptions.InvalidRequestException
 import com.netflix.spinnaker.kork.web.exceptions.ValidationException
@@ -36,8 +37,6 @@ import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.RequestMethod
 import org.springframework.web.bind.annotation.RestController
 
-import javax.servlet.http.HttpServletResponse
-
 @RestController
 @Slf4j
 class OperationsController {
@@ -87,8 +86,8 @@ class OperationsController {
       throw new InvalidRequestException("Pipeline is disabled and cannot be started.")
     }
 
-    def parallel = pipeline.parallel as Boolean
-    if (!parallel) {
+    def linear = pipeline.stages.every { it.refId == null }
+    if (linear) {
       convertLinearToParallel(pipeline)
     }
 
@@ -212,8 +211,6 @@ class OperationsController {
         stage.put("requisiteStageRefIds", Collections.emptyList())
       }
     }
-
-    pipelineConfig.parallel = Boolean.TRUE
   }
 
   private Map<String, String> startPipeline(Map config) {
-Original file line number
+Diff line change
@@ Expand Up @@
           )
         )]}
         pipeline.triggers.size() == 1
-        pipeline.parallel == null
         pipeline.parameters == null
       }
@@ Expand Down @@