fix(rrb): Store RRB before-cleanup pipeline ID in the right context f…

…ield (#3239) * fix(rrb): Store RRB before cleanup pipeline ID in the right context field * test(rrb): Add checks for cleanup pipeline context info in RRB spec
spinnaker · Oct 21, 2019 · ba249be · ba249be
1 parent 122721b
commit ba249be
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/...spinnaker/orca/clouddriver/pipeline/servergroup/strategies/RollingRedBlackStrategy.groovy b/...spinnaker/orca/clouddriver/pipeline/servergroup/strategies/RollingRedBlackStrategy.groovy
@@ -377,7 +377,7 @@ class RollingRedBlackStrategy implements Strategy, ApplicationContextAware {
       def pipelineContext = [
         application        : stageData.pipelineBeforeCleanup.application,
         pipelineApplication: stageData.pipelineBeforeCleanup.application,
-        pipelineId         : stageData.pipelineBeforeCleanup.pipelineId,
+        pipeline           : stageData.pipelineBeforeCleanup.pipelineId,
         pipelineParameters : stageData.pipelineBeforeCleanup.pipelineParameters + [
           "deployedServerGroup": serverGroupCoordinates + [
             serverGroupName: deployedServerGroupName

diff --git a/...naker/orca/clouddriver/pipeline/servergroup/strategies/RollingRedBlackStrategySpec.groovy b/...naker/orca/clouddriver/pipeline/servergroup/strategies/RollingRedBlackStrategySpec.groovy
@@ -157,7 +157,11 @@ class RollingRedBlackStrategySpec extends Specification {
     afterStages.size() == 5
     afterStages.first().type == determineTargetServerGroupStage.type
     afterStages[2].type == pipelineStage.type
+    afterStages[2].context.pipelineApplication == stage.context.pipelineBeforeCleanup.application
+    afterStages[2].context.pipeline == stage.context.pipelineBeforeCleanup.pipelineId
     afterStages[4].type == pipelineStage.type
+    afterStages[4].context.pipelineApplication == stage.context.pipelineBeforeCleanup.application
+    afterStages[4].context.pipeline == stage.context.pipelineBeforeCleanup.pipelineId
   }
 
   def "should correctly determine source during pin/unpin"() {