diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2016-11-17 01:17:41 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-11-17 01:17:41 +0000 |
| commit | 60306053a2a14ff881bb56eadd4968bc4d4f48dc (patch) | |
| tree | db45dfe6cd52163e57e3ea3e03ed6397e7e6d084 | |
| parent | b9c8a3d22a40d78765d6d79dc0f04dadfdb3f124 (diff) | |
| parent | 6e7019901e4c0c6b137d1cc6d8875259ded525ce (diff) | |
| download | gitlab-ce-60306053a2a14ff881bb56eadd4968bc4d4f48dc.tar.gz | |
Merge branch '23034-setup-test-env-in-prepare-stage' into 'master'
tests: Move rake assets:precompile and cloning gitlab-{shell,test} to the prepare stage
Related to #23034
See merge request !7512
| -rw-r--r-- | .gitlab-ci.yml | 15 |
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]} |