diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 34348247e91c696b127f2f36a7cc711bb3109eda..84f1f115b3cb940269ebe6edad41571c58a15d3f 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