diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2016-10-10 10:23:40 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-10-10 10:23:40 +0000 |
| commit | 2e55580b90d8605f0f37d9469e135354deabdb0b (patch) | |
| tree | 5554bdcc30e03c92478ff6921a187d45371e4408 | |
| parent | 2879da8cda500e2baaee336df8d8b569b94b2b96 (diff) | |
| parent | 67b85665777c7ee4d808a58bff8fbe199cfdbab2 (diff) | |
| download | gitlab-ce-2e55580b90d8605f0f37d9469e135354deabdb0b.tar.gz | |
Merge branch 'tests-use-tmpfs' into 'master'
Try tmpfs for repository storage, etc
See merge request !6730
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | spec/spec_helper.rb | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8645488335e..cb6f691058e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,6 +19,8 @@ variables: before_script: - source ./scripts/prepare_build.sh - cp config/gitlab.yml.example config/gitlab.yml + - mkdir -p tmp/tests + - mount -t tmpfs tmpfs tmp/tests || echo "tmpfs mount failed, falling back to disc" - bundle --version - '[ "$USE_BUNDLE_INSTALL" != "true" ] || retry bundle install --without postgres production --jobs $(nproc) "${FLAGS[@]}"' - retry gem install knapsack diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index b19f5824236..f313bd4f249 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -50,6 +50,11 @@ RSpec.configure do |config| example.run Rails.cache = caching_store end + + config.after(:each) do + FileUtils.rm_rf("tmp/tests/repositories") + FileUtils.mkdir_p("tmp/tests/repositories") + end end FactoryGirl::SyntaxRunner.class_eval do |