summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-04-20 16:37:23 +0000
committerRobert Speicher <robert@gitlab.com>2017-04-20 16:37:23 +0000
commit60a6389a7223f14156aeeec9a3854f8ea88de1f0 (patch)
treee10b9536346c9b2428b1bbc00bdb1fb65b0d4cee
parent631bc87563775ddd84f888d8f932db7f9529554f (diff)
parentcc07d0f289b9346a3849bc8ecc0f2cf93ecea79c (diff)
downloadgitlab-ce-60a6389a7223f14156aeeec9a3854f8ea88de1f0.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 e57362bd3a5..f188ee29223 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -201,7 +201,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: