summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorZ.J. van de Weg <zegerjan@gitlab.com>2016-07-20 08:35:29 +0200
committerZ.J. van de Weg <zegerjan@gitlab.com>2016-07-20 08:35:29 +0200
commitcf4c9b494e915fa0530edb67c624192617e9d473 (patch)
tree85187621887505eb369e963d40dff31de3d0e131 /.gitlab-ci.yml
parenta697b3c5c4674ae1de2e4836eda771ab2baa2ddc (diff)
downloadgitlab-ce-cf4c9b494e915fa0530edb67c624192617e9d473.tar.gz
Use YAML inheritance to DRY the .gitlab-ci.ymlfaster-builds-ci
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml33
1 files changed, 14 insertions, 19 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0bd3df4c9e8..aea4b03c455 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -63,11 +63,14 @@ update-knapsack:
# Execute all testing suites
-.rspec-knapsack: &rspec-knapsack
- stage: test
+.use-db: &use-db
services:
- mysql:latest
- redis:alpine
+
+.rspec-knapsack: &rspec-knapsack
+ stage: test
+ <<: *use-db
script:
- bundle exec rake assets:precompile 2>/dev/null
- JOB_NAME=( $CI_BUILD_NAME )
@@ -83,9 +86,7 @@ update-knapsack:
.spinach-knapsack: &spinach-knapsack
stage: test
- services:
- - mysql:latest
- - redis:alpine
+ <<: *use-db
script:
- bundle exec rake assets:precompile 2>/dev/null
- JOB_NAME=( $CI_BUILD_NAME )
@@ -134,9 +135,7 @@ spinach 9 10: *spinach-knapsack
# Execute all testing suites against Ruby 2.3
.ruby-23: &ruby-23
image: "ruby:2.3"
- services:
- - mysql:latest
- - redis:alpine
+ <<: *use-db
only:
- master
cache:
@@ -187,11 +186,14 @@ spinach 9 10 ruby23: *spinach-knapsack-ruby23
# Other generic tests
-.exec: &exec
+.static-analyses-variables: &static-analyses-variables
variables:
SIMPLECOV: "false"
USE_DB: "false"
USE_BUNDLE_INSTALL: "true"
+
+.exec: &exec
+ <<: *static-analyses-variables
stage: test
script:
- bundle exec $CI_BUILD_NAME
@@ -205,26 +207,19 @@ license_finder: *exec
rake db:migrate:reset:
stage: test
- services:
- - mysql:latest
- - redis:alpine
+ <<: *use-db
script:
- rake db:migrate:reset
teaspoon:
stage: test
- services:
- - mysql:latest
- - redis:alpine
+ <<: *use-db
script:
- teaspoon
bundler:audit:
stage: test
- variables:
- SIMPLECOV: "false"
- USE_DB: "false"
- USE_BUNDLE_INSTALL: "true"
+ <<: *static-analyses-variables
only:
- master
script: