fix(pipelines): Copying of failed child pipeline outputs (#3186)

This fixes an issue where the outputs of a failed stage that calls another pipeline would not be made available in the parent pipeline's subsequent stages.
spinnaker · Sep 23, 2019 · 1ae7811 · 1ae7811
1 parent dea4a7f
commit 1ae7811
Show file tree

Hide file tree

Showing 2 changed files with 69 additions and 11 deletions.
diff --git a/...ont50/src/main/groovy/com/netflix/spinnaker/orca/front50/tasks/MonitorPipelineTask.groovy b/...ont50/src/main/groovy/com/netflix/spinnaker/orca/front50/tasks/MonitorPipelineTask.groovy
@@ -88,7 +88,8 @@ class MonitorPipelineTask implements OverridableTimeoutRetryableTask {
       return TaskResult.builder(ExecutionStatus.TERMINAL).context([
         status   : childPipeline.status,
         exception: exceptionDetails
-      ]).build()
+      ]).outputs(childPipeline.getContext())
+        .build()
     }
 
     return TaskResult.builder(ExecutionStatus.RUNNING).context([status: childPipeline.status]).build()

diff --git a/...0/src/test/groovy/com/netflix/spinnaker/orca/front50/tasks/MonitorPipelineTaskSpec.groovy b/...0/src/test/groovy/com/netflix/spinnaker/orca/front50/tasks/MonitorPipelineTaskSpec.groovy
@@ -78,12 +78,12 @@ class MonitorPipelineTaskSpec extends Specification {
         type = PipelineStage.PIPELINE_CONFIG_TYPE
         name = "pipeline"
         outputs = [
-                artifacts: [
-                  [type: "docker/image",
-                   reference: "gcr.io/project/my-image@sha256:28f82eba",
-                   name: "gcr.io/project/my-image",
-                   version: "sha256:28f82eba"],
-                ]
+          artifacts: [
+            [type     : "docker/image",
+             reference: "gcr.io/project/my-image@sha256:28f82eba",
+             name     : "gcr.io/project/my-image",
+             version  : "sha256:28f82eba"],
+          ]
         ]
       }
       status = ExecutionStatus.SUCCEEDED
@@ -150,12 +150,69 @@ class MonitorPipelineTaskSpec extends Specification {
         ]
       ],
       // source should reference the _first_ halted stage in the child pipeline
-      source: [
+      source : [
         executionId: pipeline.id,
-        stageId: pipeline.stages[1].id,
-        stageName: "a pipeline",
-        stageIndex: 1
+        stageId    : pipeline.stages[1].id,
+        stageName  : "a pipeline",
+        stageIndex : 1
       ]
     ]
   }
+
+  def "propagates child pipeline outputs"() {
+    def pipeline = pipeline {
+      application = "orca"
+      name = "a pipeline"
+      stage {
+        type = PipelineStage.PIPELINE_CONFIG_TYPE
+        name = "stage with outputs"
+        outputs = [
+          "myVar1": "myValue1",
+          "myVar2": "myValue2"
+        ]
+      }
+      status = ExecutionStatus.SUCCEEDED
+    }
+
+    repo.retrieve(*_) >> pipeline
+
+    when:
+    def result = task.execute(stage)
+    def outputs = result.outputs
+
+    then:
+    outputs == [
+      "myVar1": "myValue1",
+      "myVar2": "myValue2"
+    ]
+  }
+
+  def "propagates failed child pipeline outputs"() {
+    def pipeline = pipeline {
+      application = "orca"
+      name = "a pipeline"
+      stage {
+        type = PipelineStage.PIPELINE_CONFIG_TYPE
+        name = "failed stage with outputs"
+        outputs = [
+          "myVar1": "myValue1",
+          "myVar2": "myValue2"
+        ]
+        status = ExecutionStatus.TERMINAL
+      }
+      status = ExecutionStatus.TERMINAL
+    }
+
+    repo.retrieve(*_) >> pipeline
+
+    when:
+    def result = task.execute(stage)
+    def outputs = result.outputs
+
+    then:
+    outputs == [
+      "myVar1": "myValue1",
+      "myVar2": "myValue2"
+    ]
+  }
 }