summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2015-07-21 22:48:54 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2015-07-29 15:51:45 +0200
commit27fc082de4dfe0a4eb1fc1bcf5202db1255e1bf1 (patch)
treea1795151fb3a80fb0e240920443c1ef9ddd16cb5
parentd5214bb6ff38ab31817ad5cb6e3436e52c4792a7 (diff)
downloadgitlab-ci-27fc082de4dfe0a4eb1fc1bcf5202db1255e1bf1.tar.gz
Don't send notifications for jobs with allow_failure set
-rw-r--r--app/models/project_services/hip_chat_service.rb2
-rw-r--r--app/models/project_services/mail_service.rb2
-rw-r--r--app/models/project_services/slack_message.rb1
-rw-r--r--app/models/project_services/slack_service.rb2
4 files changed, 7 insertions, 0 deletions
diff --git a/app/models/project_services/hip_chat_service.rb b/app/models/project_services/hip_chat_service.rb
index 8e5f024..70f6a67 100644
--- a/app/models/project_services/hip_chat_service.rb
+++ b/app/models/project_services/hip_chat_service.rb
@@ -44,6 +44,8 @@ class HipChatService < Service
end
def execute build
+ return if build.allow_failure?
+
commit = build.commit
return unless commit
return unless commit.builds_without_retry.include? build
diff --git a/app/models/project_services/mail_service.rb b/app/models/project_services/mail_service.rb
index a920968..8520786 100644
--- a/app/models/project_services/mail_service.rb
+++ b/app/models/project_services/mail_service.rb
@@ -58,6 +58,8 @@ class MailService < Service
end
def execute(build)
+ return if build.allow_failure?
+
# it doesn't make sense to send emails for retried builds
commit = build.commit
return unless commit
diff --git a/app/models/project_services/slack_message.rb b/app/models/project_services/slack_message.rb
index 15d6ee3..6e8bb6f 100644
--- a/app/models/project_services/slack_message.rb
+++ b/app/models/project_services/slack_message.rb
@@ -22,6 +22,7 @@ class SlackMessage
if commit.matrix?
commit.builds_without_retry.each do |build|
+ next if build.allow_failure?
next unless build.failed?
fields << {
title: build.name,
diff --git a/app/models/project_services/slack_service.rb b/app/models/project_services/slack_service.rb
index c393bd4..a1f701b 100644
--- a/app/models/project_services/slack_service.rb
+++ b/app/models/project_services/slack_service.rb
@@ -57,6 +57,8 @@ class SlackService < Service
end
def execute(build)
+ return if build.allow_failure?
+
commit = build.commit
return unless commit
return unless commit.builds_without_retry.include?(build)