Merge pull request #22489 from vespa-engine/ean/enable-staging-and-system-notifications

Enable notification dispatch for system and staging tests

1 files changed, 5 insertions, 4 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/Notifier.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/Notifier.java
index 5a5188da37f..36a254f5c4b 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/Notifier.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/Notifier.java
@@ -72,10 +72,11 @@ public class Notifier {
     }
 
     private boolean skipSource(NotificationSource source) {
-        // Limit sources to production systems only. Dev and test systems cause too much noise at the moment.
-        if (source.zoneId().map(z -> z.environment() != Environment.prod).orElse(false)) {
-            return true;
-        } else if (source.jobType().map(t -> !t.isProduction()).orElse(false)) {
+        // Do not dispatch notification for dev and perf environments
+        if (source.zoneId()
+                .map(z -> z.environment())
+                .map(e -> e == Environment.dev || e == Environment.perf)
+                .orElse(false)) {
             return true;
         }
         return false;