diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2016-11-13 17:12:08 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2016-11-13 17:12:08 +0000 |
| commit | 2688957330ae11c7d7b13596ae1a6360cb4a0384 (patch) | |
| tree | f54d277662910dcef67b3e4c4a05a946ff453431 | |
| parent | 6480259744476ec7fdcb1464ed709f9833f29d95 (diff) | |
| parent | 40062fdc02fe2d0ee5ac9c9462f8692814e69d6e (diff) | |
| download | gitlab-ce-2688957330ae11c7d7b13596ae1a6360cb4a0384.tar.gz | |
Merge branch 'zj-update-ci' into 'master'
Only run builds on master of CE or EE
This should reduce builds run by projects still running all pipelines for CE
See merge request !6869
| -rw-r--r-- | .gitlab-ci.yml | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 34348247e91..84f1f115b3c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -61,9 +61,10 @@ update-knapsack: - scripts/merge-reports knapsack/spinach_report.json knapsack/spinach_node_*.json - rm -f knapsack/*_node_*.json only: - - master - -# Execute all testing suites + - master@gitlab-org/gitlab-ce + - master@gitlab-org/gitlab-ee + - master@gitlab/gitlabhq + - master@gitlab/gitlab-ee .use-db: &use-db services: @@ -143,7 +144,10 @@ spinach 9 10: *spinach-knapsack image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.1-git-2.7-phantomjs-2.1" <<: *use-db only: - - master + - master@gitlab-org/gitlab-ce + - master@gitlab-org/gitlab-ee + - master@gitlab/gitlabhq + - master@gitlab/gitlab-ee cache: key: "ruby21" paths: @@ -286,7 +290,10 @@ bundler:audit: stage: test <<: *ruby-static-analysis only: - - master + - master@gitlab-org/gitlab-ce + - master@gitlab-org/gitlab-ee + - master@gitlab/gitlabhq + - master@gitlab/gitlab-ee script: - "bundle exec bundle-audit check --update --ignore OSVDB-115941" @@ -297,6 +304,9 @@ migration paths: SETUP_DB: "false" only: - master@gitlab-org/gitlab-ce + - master@gitlab-org/gitlab-ee + - master@gitlab/gitlabhq + - master@gitlab/gitlab-ee script: - git checkout HEAD . - git fetch --tags |