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

Merge branch 'fix/split-ci-jobs' into 'master'
2837f5c1 · Douwe Maan · aacde42d · d7e97a36 · 2837f5c1
Commit 2837f5c1 authored Feb 09, 2016 by Douwe Maan
Hide whitespace changes
Inline Side-by-side

Showing with 85 additions and 4 deletions

.gitlab-ci.yml .gitlab-ci.yml +85 -4

No files found.
--- 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