summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-02-09 11:52:24 +0000
committerDouwe Maan <douwe@gitlab.com>2016-02-09 11:52:24 +0000
commit2837f5c179ebef57de4cbaa7587173d35a4cb397 (patch)
tree26550f972812da176ddbb60bf00aa726e4c1d066
parentaacde42d55cb485413ced7eb64c396c47e58fa47 (diff)
parentd7e97a36d2756c2abaf3a8a7cd1c6172d34c0779 (diff)
downloadgitlab-ce-2837f5c179ebef57de4cbaa7587173d35a4cb397.tar.gz
Merge branch 'fix/split-ci-jobs' into 'master'
split gitlab-ci builds for ruby 2.1 Added breakdown of builds for Ruby 2.1 in .gitlab-ci.yml config file. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13252 See merge request !2746
-rw-r--r--.gitlab-ci.yml89
1 files changed, 85 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dbdbae9d787..5dfeb8a1f90 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -137,23 +137,104 @@ bundler:audit:
# Ruby 2.1 jobs
-spec:ruby21:
+spec:feature:ruby21:
image: ruby:2.1
+ only:
+ - master
script:
- RAILS_ENV=test bundle exec rake assets:precompile 2>/dev/null
- - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec
+ - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:feature
+ tags:
+ - ruby
+ - mysql
+
+spec:api:ruby21:
+ image: ruby:2.1
+ only:
+ - master
+ script:
+ - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:api
+ tags:
+ - ruby
+ - mysql
+
+spec:models:ruby21:
+ image: ruby:2.1
+ only:
+ - master
+ script:
+ - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:models
tags:
- ruby
- mysql
+
+spec:lib:ruby21:
+ image: ruby:2.1
only:
- master
+ script:
+ - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:lib
+ tags:
+ - ruby
+ - mysql
-spinach:ruby21:
+spec:services:ruby21:
image: ruby:2.1
+ only:
+ - master
script:
- - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach
+ - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:services
tags:
- ruby
- mysql
+
+spec:benchmark:ruby21:
+ image: ruby:2.1
only:
- master
+ script:
+ - RAILS_ENV=test bundle exec rake spec:benchmark
+ tags:
+ - ruby
+ - mysql
+ allow_failure: true
+
+spec:other:ruby21:
+ image: ruby:2.1
+ only:
+ - master
+ script:
+ - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:other
+ tags:
+ - ruby
+ - mysql
+
+spinach:project:half:ruby21:
+ image: ruby:2.1
+ only:
+ - master
+ script:
+ - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:project:half
+ tags:
+ - ruby
+ - mysql
+
+spinach:project:rest:ruby21:
+ image: ruby:2.1
+ only:
+ - master
+ script:
+ - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:project:rest
+ tags:
+ - ruby
+ - mysql
+
+spinach:other:ruby21:
+ image: ruby:2.1
+ only:
+ - master
+ script:
+ - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:other
+ tags:
+ - ruby
+ - mysql