Merge pull request #98 from anotherchrisberry/disabled-pipeline

do not fire triggers if pipeline is disabled
spinnaker · Aug 13, 2016 · 7c40b0a · 7c40b0a
2 parents e23664f + 45d3a2c
commit 7c40b0a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/echo-model/src/main/java/com/netflix/spinnaker/echo/model/Pipeline.java b/echo-model/src/main/java/com/netflix/spinnaker/echo/model/Pipeline.java
@@ -45,6 +45,9 @@
   @JsonProperty
   boolean parallel;
 
+  @JsonProperty
+  boolean disabled;
+
   @JsonProperty
   boolean limitConcurrent;
 

diff --git a/...ers/src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/monitor/TriggerMonitor.java b/...ers/src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/monitor/TriggerMonitor.java
@@ -90,7 +90,7 @@ protected Action1<TriggerEvent> triggerEachMatchFrom(final List<Pipeline> pipeli
   protected Func1<Pipeline, Optional<Pipeline>> withMatchingTrigger(final TriggerEvent event) {
     val triggerPredicate = matchTriggerFor(event);
     return pipeline -> {
-      if (pipeline.getTriggers() == null) {
+      if (pipeline.getTriggers() == null || pipeline.isDisabled()) {
         return Optional.empty();
       } else {
         return pipeline.getTriggers()