summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml24
1 files changed, 24 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 79ec1b881d4..0a8e0201c4b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -48,6 +48,7 @@ after_script:
stages:
- build
- prepare
+ - merge
- test
- post-test
- pages
@@ -1025,3 +1026,26 @@ schedule:review-cleanup:
- gem install gitlab --no-document
script:
- ruby -rrubygems scripts/review_apps/automated_cleanup.rb
+
+merge:master:
+ image: registry.gitlab.com/gitlab-org/merge-train
+ stage: merge
+ # The global before_script/after_script blocks break this job, or aren't
+ # necessary. These two lines result in them being ignored.
+ before_script: []
+ after_script: []
+ only:
+ refs:
+ - master
+ - schedules
+ variables:
+ - $CI_PROJECT_PATH == "gitlab-org/gitlab-ce"
+ - $MERGE_TRAIN_SSH_PUBLIC_KEY
+ - $MERGE_TRAIN_SSH_PRIVATE_KEY
+ - $MERGE_TRAIN_API_TOKEN
+ script:
+ - scripts/merge-train
+ cache:
+ paths:
+ - gitlab-ee
+ key: "merge:master"