diff --git a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/servergroup/strategies/RollingRedBlackStrategy.groovy b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/servergroup/strategies/RollingRedBlackStrategy.groovy index 734ad50b90..ffb369ccbd 100644 --- a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/servergroup/strategies/RollingRedBlackStrategy.groovy +++ b/orca-clouddriver/src/main/groovy/com/netflix/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/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/servergroup/strategies/RollingRedBlackStrategySpec.groovy b/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/servergroup/strategies/RollingRedBlackStrategySpec.groovy index 6b4b2f9926..d0ea86c42c 100644 --- a/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/servergroup/strategies/RollingRedBlackStrategySpec.groovy +++ b/orca-clouddriver/src/test/groovy/com/netflix/spinnaker/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"() {