Skip to content
Snippets Groups Projects
Commit 5a77eb15 authored by Douwe Maan's avatar Douwe Maan
Browse files

Merge branch 'faster-builds-ci' into 'master'

Speed improvement for builds without DB

Only fetch the images which we are going to use. Speeds up the builds by about 30-45 seconds.

/cc @ayufan 

See merge request !4994
parents 5eb307a1 cf4c9b49
No related branches found
No related tags found
No related merge requests found
image: "ruby:2.1"
 
services:
- mysql:latest
- redis:alpine
cache:
key: "ruby21"
paths:
Loading
Loading
@@ -34,7 +30,6 @@ stages:
- post-test
 
# Prepare and merge knapsack tests
.knapsack-state: &knapsack-state
services: []
variables:
Loading
Loading
@@ -68,8 +63,14 @@ update-knapsack:
 
# Execute all testing suites
 
.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 )
Loading
Loading
@@ -85,6 +86,7 @@ update-knapsack:
 
.spinach-knapsack: &spinach-knapsack
stage: test
<<: *use-db
script:
- bundle exec rake assets:precompile 2>/dev/null
- JOB_NAME=( $CI_BUILD_NAME )
Loading
Loading
@@ -133,6 +135,7 @@ spinach 9 10: *spinach-knapsack
# Execute all testing suites against Ruby 2.3
.ruby-23: &ruby-23
image: "ruby:2.3"
<<: *use-db
only:
- master
cache:
Loading
Loading
@@ -183,23 +186,41 @@ spinach 9 10 ruby23: *spinach-knapsack-ruby23
 
# Other generic tests
 
.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
 
teaspoon: *exec
rubocop: *exec
rake scss_lint: *exec
rake brakeman: *exec
rake flog: *exec
rake flay: *exec
rake db:migrate:reset: *exec
license_finder: *exec
rake downtime_check: *exec
 
rake db:migrate:reset:
stage: test
<<: *use-db
script:
- rake db:migrate:reset
teaspoon:
stage: test
<<: *use-db
script:
- teaspoon
bundler:audit:
stage: test
<<: *static-analyses-variables
only:
- master
script:
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment