diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-12-04 18:50:08 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-12-04 18:50:08 +0300 |
| commit | acd18a0900fd26bb52fe76642c14e3e890cff732 (patch) | |
| tree | 10175fafd3f71e8f7e514ae5e92a446059bb62e9 /.gitlab-ci.yml | |
| parent | f1b4c9f55c48dfc24a30d9f792b272e2e4d1812f (diff) | |
| parent | 191d5ab440bb37f17df342243665b12c4fbe6926 (diff) | |
Merge branch 'merge-train' into 'master'
Automatically merge CE master into EE master
See merge request gitlab-org/gitlab-ce!23453
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index caec485d845..4e71140fbc9 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" |