diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2018-12-05 14:15:38 +0300 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2018-12-05 14:15:54 +0300 |
| commit | cc40947bd9974213108bcc16789c5d3bc2aa39c1 (patch) | |
| tree | ee4ba8573e92a6bbe5afff2d7c4dfd58a296f343 /.gitlab-ci.yml | |
| parent | cd3203bf4a190273bf1209a61facfabe5d8f6ef6 (diff) | |
Remove merge:master job entirely
Apparently disabling it by checking for a variable doesn't actually
disable it.
[ci skip]
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2e822f73e9f..a97414cbba8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1053,27 +1053,3 @@ 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 - - $MERGE_FORCE_ENABLE - script: - - scripts/merge-train - cache: - paths: - - gitlab-ee - key: "merge:master" |