summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-04-20 16:37:23 +0000
committerDJ Mountney <david@twkie.net>2017-04-20 22:04:51 -0700
commitcc1d634418a4f93522444cbb9006487a9a41e0b6 (patch)
tree8e65c77e7f036b3adcdfd0d09584183d73091d1f
parent23b397896e3c52533a26f6af8cb85b7bc3f0079c (diff)
downloadgitlab-ce-cc1d634418a4f93522444cbb9006487a9a41e0b6.tar.gz
Merge branch 'no-downtime-check-stable' into 'master'
Don't run the downtime check on stable branches, or tags/master See merge request !10794
-rw-r--r--.gitlab-ci.yml8
1 files changed, 7 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 28e46ac95f1..35bf8cb0da1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -193,7 +193,13 @@ rake config_lint: *exec
rake brakeman: *exec
rake flay: *exec
license_finder: *exec
-rake downtime_check: *exec
+rake downtime_check:
+ <<: *exec
+ except:
+ - master
+ - tags
+ - /^[\d-]+-stable(-ee)?$/
+
rake ee_compat_check:
<<: *exec
only: