diff --git a/orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/ExecutionLauncher.java b/orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/ExecutionLauncher.java index 4b6de5d9c5..ec1079d657 100644 --- a/orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/ExecutionLauncher.java +++ b/orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/ExecutionLauncher.java @@ -241,7 +241,11 @@ private Execution parseOrchestration(String configJson) throws IOException { } if (config.get("trigger") != null) { - orchestration.setTrigger(objectMapper.convertValue(config.get("trigger"), Trigger.class)); + Trigger trigger = objectMapper.convertValue(config.get("trigger"), Trigger.class); + orchestration.setTrigger(trigger); + if (!trigger.getNotifications().isEmpty()) { + orchestration.setNotifications(trigger.getNotifications()); + } } orchestration.setBuildTime(clock.millis()); diff --git a/orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/model/Execution.java b/orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/model/Execution.java index d49facf4e7..1e93e43c68 100644 --- a/orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/model/Execution.java +++ b/orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/model/Execution.java @@ -286,12 +286,16 @@ public void setSource(@Nullable PipelineSource source) { this.source = source; } - private final List> notifications = new ArrayList<>(); + private List> notifications = new ArrayList<>(); public @Nonnull List> getNotifications() { return notifications; } + public void setNotifications(List> notifications) { + this.notifications = notifications; + } + private final Map initialConfig = new HashMap<>(); public @Nonnull Map getInitialConfig() {