diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2016-10-12 14:45:26 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-10-12 14:45:26 +0000 |
| commit | 8aa381c9c408baef295e721f4f11964de8db1aa0 (patch) | |
| tree | c60663390a0635ec8f5f6ad0f9c6c9fb262b26ca | |
| parent | 9b04e69a1fcb4a39d2873e5e6a396f7f16884098 (diff) | |
| download | gitlab-ce-8aa381c9c408baef295e721f4f11964de8db1aa0.tar.gz | |
Revert "Merge branch 'tests-use-tmpfs' into 'master'"
This reverts merge request !6730
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | spec/spec_helper.rb | 5 |
2 files changed, 0 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cb6f691058e..8645488335e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,8 +19,6 @@ 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 f313bd4f249..b19f5824236 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -50,11 +50,6 @@ 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 |