From 647c54da2779e5234547845ae13d8fafa478d3f3 Mon Sep 17 00:00:00 2001 From: "Z.J. van de Weg" Date: Thu, 13 Oct 2016 21:56:32 +0200 Subject: Only run builds on master of CE or EE --- .gitlab-ci.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 34348247e91..e1034032d6d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -61,8 +61,8 @@ update-knapsack: - scripts/merge-reports knapsack/spinach_report.json knapsack/spinach_node_*.json - rm -f knapsack/*_node_*.json only: - - master - + - master@gitlab-org/gitlab-ce + - master@gitlab-org/gitlab-ee # Execute all testing suites .use-db: &use-db @@ -143,7 +143,8 @@ 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 cache: key: "ruby21" paths: @@ -286,7 +287,8 @@ bundler:audit: stage: test <<: *ruby-static-analysis only: - - master + - master@gitlab-org/gitlab-ce + - master@gitlab-org/gitlab-ee script: - "bundle exec bundle-audit check --update --ignore OSVDB-115941" -- cgit v1.2.1 From 40062fdc02fe2d0ee5ac9c9462f8692814e69d6e Mon Sep 17 00:00:00 2001 From: "Z.J. van de Weg" Date: Fri, 14 Oct 2016 16:16:10 +0200 Subject: Also test on dev.gitlab [ci skip] --- .gitlab-ci.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e1034032d6d..84f1f115b3c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -63,7 +63,8 @@ update-knapsack: only: - master@gitlab-org/gitlab-ce - master@gitlab-org/gitlab-ee -# Execute all testing suites + - master@gitlab/gitlabhq + - master@gitlab/gitlab-ee .use-db: &use-db services: @@ -145,6 +146,8 @@ spinach 9 10: *spinach-knapsack only: - master@gitlab-org/gitlab-ce - master@gitlab-org/gitlab-ee + - master@gitlab/gitlabhq + - master@gitlab/gitlab-ee cache: key: "ruby21" paths: @@ -289,6 +292,8 @@ bundler:audit: only: - 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" @@ -299,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 -- cgit v1.2.1