diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2016-11-18 20:31:42 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2016-11-18 20:31:42 +0800 |
| commit | 578ced29f24f9c0db3159d366a974927fbe3946b (patch) | |
| tree | 21c33c421b2b435e31eb2923a66563f80bb9eb40 /.gitlab-ci.yml | |
| parent | 6d1c5761cd520f3cb7fa4dbb1a1937c29f468884 (diff) | |
| parent | 688ff26df3f288e5cd50096a01014188a5e4011b (diff) | |
| download | gitlab-ce-578ced29f24f9c0db3159d366a974927fbe3946b.tar.gz | |
Merge remote-tracking branch 'upstream/master' into fix-cancelling-pipelines
* upstream/master: (162 commits)
Grapify the repository API
Fix wrong link URL
Add note pointing to limitations section in environments.md
Clarify the limitation for special chars is for Review Apps
Change order of limitations list in environments.md
Add an example of invalid characters to branches for review apps
Grammar fix in environments.md: s/base/basis
Add changelog entry for #24276 / !7500
Allow registering users where the username contains dots (.).
bump rouge to 2.0.7
Fix indentation
Update copy.md with issue guideline updates and merge request guidelines
Refactor github import to reduce number of API calls
Fix missing URL from environments docs
Check all namespaces on validation of new username.
Allow sorting groups in API
Use the public CE repo URL instead of the one used in the runner
Fix typos
Fix wrong changelog item
Add missing item for 8.13.6
...
Diffstat (limited to '.gitlab-ci.yml')
| -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]} |