fix(queue): canaries were not attaching their deploy stages

spinnaker · May 4, 2017 · b602837 · b602837
1 parent 134ebf5
commit b602837
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/orca-mine/src/main/groovy/com/netflix/spinnaker/orca/mine/pipeline/DeployCanaryStage.groovy b/orca-mine/src/main/groovy/com/netflix/spinnaker/orca/mine/pipeline/DeployCanaryStage.groovy
@@ -152,7 +152,7 @@ class DeployCanaryStage extends ParallelDeployStage implements CloudProviderAwar
       def context = stage.context
       def allStages = stage.execution.stages
       def deployStages = allStages.findAll {
-        it.parentStageId == stage.id && it.type == ParallelDeployStage.PIPELINE_CONFIG_TYPE
+        it.parentStageId == stage.id
       }
       def deployedClusterPairs = []
       for (Map pair in context.clusterPairs) {

diff --git a/orca-queue/src/main/kotlin/com/netflix/spinnaker/orca/q/StageDefinitionBuilders.kt b/orca-queue/src/main/kotlin/com/netflix/spinnaker/orca/q/StageDefinitionBuilders.kt
@@ -32,7 +32,7 @@ import com.netflix.spinnaker.orca.pipeline.model.SyntheticStageOwner.STAGE_BEFOR
  */
 fun StageDefinitionBuilder.buildTasks(stage: Stage<*>) {
   val taskGraph =
-    if (this is BranchingStageDefinitionBuilder && stage.getParentStageId() == null) {
+    if (this is BranchingStageDefinitionBuilder && (stage.getParentStageId() == null || stage.parent().getType() != stage.getType())) {
       buildPostGraph(stage)
     } else {
       buildTaskGraph(stage)
@@ -156,7 +156,7 @@ private fun SyntheticStages.buildAfterStages(stage: Stage<out Execution<*>>, cal
 }
 
 private fun StageDefinitionBuilder.buildParallelStages(stage: Stage<out Execution<*>>, callback: (Stage<*>) -> Unit) {
-  if (this is BranchingStageDefinitionBuilder && stage.getParentStageId() == null) {
+  if (this is BranchingStageDefinitionBuilder && (stage.getParentStageId() == null || stage.parent().getType() != stage.getType())) {
     val parallelContexts = parallelContexts(stage)
     parallelContexts
       .map { context ->