From de76fb9a27b5f66dc7b5444ae165df43960545ab Mon Sep 17 00:00:00 2001
From: Thorsten Eckel <te@zammad.com>
Date: Mon, 15 Mar 2021 09:22:23 +0100
Subject: [PATCH] Maintenance: Run special GitLab CI jobs only if previous
 stage completes successfully.

---
 .gitlab/ci/integration/slack.yml | 2 +-
 .gitlab/ci/pre.yml               | 2 +-
 .gitlab/ci/rspec.yml             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab/ci/integration/slack.yml b/.gitlab/ci/integration/slack.yml
index c53642c37..893012bd7 100644
--- a/.gitlab/ci/integration/slack.yml
+++ b/.gitlab/ci/integration/slack.yml
@@ -7,7 +7,7 @@ slack:
     - if: '$CI_COMMIT_BRANCH =~ /^private/'
       when: manual
       allow_failure: true
-    - when: always
+    - when: on_success
   script:
     - bundle exec rake zammad:db:unseeded
     - echo "gem 'slack-ruby-client'" >> Gemfile.local
diff --git a/.gitlab/ci/pre.yml b/.gitlab/ci/pre.yml
index a628d5a88..8bd5fc728 100644
--- a/.gitlab/ci/pre.yml
+++ b/.gitlab/ci/pre.yml
@@ -52,7 +52,7 @@ global_refresh_envs:
     - if: '$CI_COMMIT_BRANCH =~ /^private/'
       when: manual
       allow_failure: true
-    - when: always
+    - when: on_success
 
   script:
     - bundle exec rake zammad:ci:refresh_envs
diff --git a/.gitlab/ci/rspec.yml b/.gitlab/ci/rspec.yml
index bf9baab15..2c66a6af0 100644
--- a/.gitlab/ci/rspec.yml
+++ b/.gitlab/ci/rspec.yml
@@ -36,7 +36,7 @@ rspec:mysql:integration:
     - if: '$CI_COMMIT_BRANCH =~ /^private/'
       when: manual
       allow_failure: true
-    - when: always
+    - when: on_success
   script:
     - bundle exec rake zammad:db:init
     - bundle exec rspec -t type:integration