Skip to content

Commit

Permalink
fix(conditions): Only pause pipeline deploys (#3150)
Browse files Browse the repository at this point in the history
* fix(conditions): Only pause pipeline deploys

- Pausing deployments should only apply to pipelines
- Orchestrations should be ignored

* - PR feedback: s/Restricting/Restrict
  • Loading branch information
jeyrschabu committed Sep 16, 2019
1 parent 0098b13 commit 844878f
Showing 1 changed file with 4 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 844878f

Please sign in to comment.