fix(orca-clouddriver): Do not mark ResizeAsgStage as SUCCESSFUL in ta…

…skGraph() (#3737)
spinnaker · Jun 12, 2020 · b070125 · b070125
1 parent f32906c
commit b070125
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/...louddriver/src/main/groovy/com/netflix/spinnaker/orca/kato/pipeline/ResizeAsgStage.groovy b/...louddriver/src/main/groovy/com/netflix/spinnaker/orca/kato/pipeline/ResizeAsgStage.groovy
@@ -56,14 +56,6 @@ class ResizeAsgStage implements StageDefinitionBuilder {
 
   @Override
   void taskGraph(@Nonnull StageExecution stage, @Nonnull TaskNode.Builder builder) {
-    if (!stage.parentStageId || stage.execution.stages.find {
-      it.id == stage.parentStageId
-    }.type != stage.type) {
-      // mark as SUCCEEDED otherwise a stage w/o child tasks will remain in NOT_STARTED
-      stage.status = ExecutionStatus.SUCCEEDED
-      return
-    }
-
     builder
       .withTask("determineHealthProviders", DetermineHealthProvidersTask)
       .withTask("resizeAsg", ResizeAsgTask)

diff --git a/...driver/src/test/groovy/com/netflix/spinnaker/orca/kato/pipeline/ResizeAsgStageSpec.groovy b/...driver/src/test/groovy/com/netflix/spinnaker/orca/kato/pipeline/ResizeAsgStageSpec.groovy
@@ -50,7 +50,7 @@ class ResizeAsgStageSpec extends Specification {
     stageBuilder.buildTaskGraph(stage)
 
     then:
-    stage.status == ExecutionStatus.SUCCEEDED
+    stage.status == ExecutionStatus.NOT_STARTED
 
     when:
     stageBuilder.beforeStages(stage, graphBefore)