summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2016-11-16 20:34:09 +0000
committerNick Thomas <nick@gitlab.com>2016-11-16 22:06:07 +0000
commit6e7019901e4c0c6b137d1cc6d8875259ded525ce (patch)
tree9692978b28aae146fe2624ecea2a1b179d970d99
parent4d59a9e7687dce01d7c9e12c882a96832deff941 (diff)
downloadgitlab-ce-6e7019901e4c0c6b137d1cc6d8875259ded525ce.tar.gz
tests: Move rake assets:precompile and cloning gitlab-{shell,test} to the prepare stage
-rw-r--r--.gitlab-ci.yml15
1 files changed, 13 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 84f1f115b3c..436e9ec6c60 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -71,11 +71,23 @@ update-knapsack:
- mysql:latest
- redis:alpine
+setup-test-env:
+ <<: *use-db
+ stage: prepare
+ script:
+ - bundle exec rake assets:precompile 2>/dev/null
+ - bundle exec ruby -Ispec -e 'require "spec_helper" ; TestEnv.init'
+ artifacts:
+ expire_in: 7d
+ paths:
+ - public/assets
+ - tmp/tests
+
+
.rspec-knapsack: &rspec-knapsack
stage: test
<<: *use-db
script:
- - bundle exec rake assets:precompile 2>/dev/null
- JOB_NAME=( $CI_BUILD_NAME )
- export CI_NODE_INDEX=${JOB_NAME[1]}
- export CI_NODE_TOTAL=${JOB_NAME[2]}
@@ -93,7 +105,6 @@ update-knapsack:
stage: test
<<: *use-db
script:
- - bundle exec rake assets:precompile 2>/dev/null
- JOB_NAME=( $CI_BUILD_NAME )
- export CI_NODE_INDEX=${JOB_NAME[1]}
- export CI_NODE_TOTAL=${JOB_NAME[2]}