From 844878fad94ee6e69781b932ee5df4cecc55d01d Mon Sep 17 00:00:00 2001 From: Jeyrs Chabu Date: Mon, 16 Sep 2019 10:07:19 -0700 Subject: [PATCH] fix(conditions): Only pause pipeline deploys (#3150) * fix(conditions): Only pause pipeline deploys - Pausing deployments should only apply to pipelines - Orchestrations should be ignored * - PR feedback: s/Restricting/Restrict --- .../pipeline/ConditionAwareDeployStagePreprocessor.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/ConditionAwareDeployStagePreprocessor.java b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/ConditionAwareDeployStagePreprocessor.java index 346975b430..f63b5a1613 100644 --- a/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/ConditionAwareDeployStagePreprocessor.java +++ b/orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/ConditionAwareDeployStagePreprocessor.java @@ -21,6 +21,7 @@ import com.netflix.spinnaker.orca.clouddriver.pipeline.conditions.WaitForConditionStage; import com.netflix.spinnaker.orca.clouddriver.pipeline.servergroup.strategies.DeployStagePreProcessor; import com.netflix.spinnaker.orca.kato.pipeline.support.StageData; +import com.netflix.spinnaker.orca.pipeline.model.Execution; import com.netflix.spinnaker.orca.pipeline.model.Stage; import java.util.*; import java.util.stream.Collectors; @@ -48,7 +49,9 @@ public ConditionAwareDeployStagePreprocessor( @Override public boolean supports(Stage stage) { - return true; + // Restrict pausing deployments to Pipeline executions only + // Orchestrations do not currently allow a user to skip the wait in the UI + return stage.getExecution().getType().equals(Execution.ExecutionType.PIPELINE); } @Override