From 2d1a57f336f7cbfa05221ae822400824bdea63d3 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sun, 8 May 2016 14:45:12 +0200 Subject: [PATCH] HACK: Set Notify on the build started trigger as well It should probably be changed more to get the BuildMemory.MemoryImprint from the outer context and use the same iteration loop. This should be good enough to silence some of the output. --- .../gerrit/trigger/gerritnotifier/ParameterExpander.java | 2 +- .../job/rest/BuildStartedRestCommandJob.java | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/gerritnotifier/ParameterExpander.java b/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/gerritnotifier/ParameterExpander.java index 6c59c5a68..78f916847 100644 --- a/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/gerritnotifier/ParameterExpander.java +++ b/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/gerritnotifier/ParameterExpander.java @@ -482,7 +482,7 @@ public Notify getHighestNotificationLevel(MemoryImprint memoryImprint, boolean o * @param trigger the trigger. * @return the level value. */ - private Notify getNotificationLevel(GerritTrigger trigger) { + public Notify getNotificationLevel(GerritTrigger trigger) { String level = trigger.getNotificationLevel(); if (level != null && level.length() > 0) { return Notify.valueOf(level); diff --git a/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/gerritnotifier/job/rest/BuildStartedRestCommandJob.java b/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/gerritnotifier/job/rest/BuildStartedRestCommandJob.java index 607ce5e4c..89b37ab0f 100644 --- a/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/gerritnotifier/job/rest/BuildStartedRestCommandJob.java +++ b/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/gerritnotifier/job/rest/BuildStartedRestCommandJob.java @@ -29,6 +29,8 @@ import com.sonyericsson.hudson.plugins.gerrit.trigger.config.IGerritHudsonTriggerConfig; import com.sonyericsson.hudson.plugins.gerrit.trigger.gerritnotifier.ParameterExpander; import com.sonyericsson.hudson.plugins.gerrit.trigger.gerritnotifier.model.BuildsStartedStats; +import com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger; +import com.sonymobile.tools.gerrit.gerritevents.dto.rest.Notify; import com.sonymobile.tools.gerrit.gerritevents.dto.rest.ReviewInput; import hudson.model.Run; import hudson.model.TaskListener; @@ -70,7 +72,12 @@ public BuildStartedRestCommandJob(IGerritHudsonTriggerConfig config, Run build, */ protected ReviewInput createReview() { String message = parameterExpander.getBuildStartedMessage(build, listener, event, stats); - return new ReviewInput(message); + Notify notificationLevel = Notify.ALL; + GerritTrigger trigger = GerritTrigger.getTrigger(build.getParent()); + if (trigger != null) { + notificationLevel = parameterExpander.getNotificationLevel(trigger); + } + return new ReviewInput(message).setNotify(notificationLevel); } }