Commit a697b3c5 authored by Z.J. van de Weg's avatar Z.J. van de Weg

Speed improvement for builds without DB

Now the builds which do not use the DB or Redis won't pull the images
from docker, and won't migrate the DB. This _should_ improve the build
times slightly but also create a cleaner trace.
parent bef4294c
image: "ruby:2.1" image: "ruby:2.1"
services:
- mysql:latest
- redis:alpine
cache: cache:
key: "ruby21" key: "ruby21"
paths: paths:
...@@ -34,7 +30,6 @@ stages: ...@@ -34,7 +30,6 @@ stages:
- post-test - post-test
# Prepare and merge knapsack tests # Prepare and merge knapsack tests
.knapsack-state: &knapsack-state .knapsack-state: &knapsack-state
services: [] services: []
variables: variables:
...@@ -70,6 +65,9 @@ update-knapsack: ...@@ -70,6 +65,9 @@ update-knapsack:
.rspec-knapsack: &rspec-knapsack .rspec-knapsack: &rspec-knapsack
stage: test stage: test
services:
- mysql:latest
- redis:alpine
script: script:
- bundle exec rake assets:precompile 2>/dev/null - bundle exec rake assets:precompile 2>/dev/null
- JOB_NAME=( $CI_BUILD_NAME ) - JOB_NAME=( $CI_BUILD_NAME )
...@@ -85,6 +83,9 @@ update-knapsack: ...@@ -85,6 +83,9 @@ update-knapsack:
.spinach-knapsack: &spinach-knapsack .spinach-knapsack: &spinach-knapsack
stage: test stage: test
services:
- mysql:latest
- redis:alpine
script: script:
- bundle exec rake assets:precompile 2>/dev/null - bundle exec rake assets:precompile 2>/dev/null
- JOB_NAME=( $CI_BUILD_NAME ) - JOB_NAME=( $CI_BUILD_NAME )
...@@ -133,6 +134,9 @@ spinach 9 10: *spinach-knapsack ...@@ -133,6 +134,9 @@ spinach 9 10: *spinach-knapsack
# Execute all testing suites against Ruby 2.3 # Execute all testing suites against Ruby 2.3
.ruby-23: &ruby-23 .ruby-23: &ruby-23
image: "ruby:2.3" image: "ruby:2.3"
services:
- mysql:latest
- redis:alpine
only: only:
- master - master
cache: cache:
...@@ -184,21 +188,43 @@ spinach 9 10 ruby23: *spinach-knapsack-ruby23 ...@@ -184,21 +188,43 @@ spinach 9 10 ruby23: *spinach-knapsack-ruby23
# Other generic tests # Other generic tests
.exec: &exec .exec: &exec
variables:
SIMPLECOV: "false"
USE_DB: "false"
USE_BUNDLE_INSTALL: "true"
stage: test stage: test
script: script:
- bundle exec $CI_BUILD_NAME - bundle exec $CI_BUILD_NAME
teaspoon: *exec
rubocop: *exec rubocop: *exec
rake scss_lint: *exec rake scss_lint: *exec
rake brakeman: *exec rake brakeman: *exec
rake flog: *exec rake flog: *exec
rake flay: *exec rake flay: *exec
rake db:migrate:reset: *exec
license_finder: *exec license_finder: *exec
rake db:migrate:reset:
stage: test
services:
- mysql:latest
- redis:alpine
script:
- rake db:migrate:reset
teaspoon:
stage: test
services:
- mysql:latest
- redis:alpine
script:
- teaspoon
bundler:audit: bundler:audit:
stage: test stage: test
variables:
SIMPLECOV: "false"
USE_DB: "false"
USE_BUNDLE_INSTALL: "true"
only: only:
- master - master
script: script:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment