diff options
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 80ba8e5c1a1..f9c5ebe7a35 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -290,7 +290,7 @@ flaky-examples-check: - scripts/merge-reports ${NEW_FLAKY_SPECS_REPORT} rspec_flaky/new_*_*.json - scripts/detect-new-flaky-examples $NEW_FLAKY_SPECS_REPORT -setup-test-env: +compile-assets: <<: *dedicated-runner <<: *except-docs <<: *use-pg @@ -301,13 +301,25 @@ setup-test-env: - node --version - yarn install --frozen-lockfile --cache-folder .yarn-cache - bundle exec rake gitlab:assets:compile - - bundle exec ruby -Ispec -e 'require "spec_helper" ; TestEnv.init' - - scripts/gitaly-test-build # Do not use 'bundle exec' here artifacts: expire_in: 7d paths: - node_modules - public/assets + +setup-test-env: + <<: *dedicated-runner + <<: *except-docs + <<: *use-pg + stage: prepare + cache: + <<: *default-cache + script: + - bundle exec ruby -Ispec -e 'require "spec_helper" ; TestEnv.init' + - scripts/gitaly-test-build # Do not use 'bundle exec' here + artifacts: + expire_in: 7d + paths: - tmp/tests rspec-pg 0 26: *rspec-metadata-pg @@ -664,6 +676,7 @@ lint:javascript:report: <<: *pull-cache stage: post-test dependencies: + - compile-assets - setup-test-env before_script: [] script: |