diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-07-21 22:48:54 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-07-23 11:47:01 +0200 |
| commit | d01daeaab656e46d2833e9eb5fc380f0eefa42ab (patch) | |
| tree | afe55e8785865788d06da520fdfd838c1abc0c62 | |
| parent | 0e373509bbc1a323fa8eacddf29260fa6715e9cf (diff) | |
| download | gitlab-ci-allow-failure-fix.tar.gz | |
Don't send notifications for jobs with allow_failure setallow-failure-fix
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/models/project_services/hip_chat_service.rb | 2 | ||||
| -rw-r--r-- | app/models/project_services/mail_service.rb | 2 | ||||
| -rw-r--r-- | app/models/project_services/slack_message.rb | 1 | ||||
| -rw-r--r-- | app/models/project_services/slack_service.rb | 2 |
5 files changed, 8 insertions, 0 deletions
@@ -1,5 +1,6 @@ v7.13.1 - Fix: user could steal specific runner + - Fix: don't send notifications for jobs with allow_failure set v7.13.0 - Allow to specify image and services in yml that can be used with docker 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) |