Commit 8aa381c9 authored by Yorick Peterse's avatar Yorick Peterse

Revert "Merge branch 'tests-use-tmpfs' into 'master'"

This reverts merge request !6730
parent 9b04e69a
...@@ -19,8 +19,6 @@ variables: ...@@ -19,8 +19,6 @@ variables:
before_script: before_script:
- source ./scripts/prepare_build.sh - source ./scripts/prepare_build.sh
- cp config/gitlab.yml.example config/gitlab.yml - 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 - bundle --version
- '[ "$USE_BUNDLE_INSTALL" != "true" ] || retry bundle install --without postgres production --jobs $(nproc) "${FLAGS[@]}"' - '[ "$USE_BUNDLE_INSTALL" != "true" ] || retry bundle install --without postgres production --jobs $(nproc) "${FLAGS[@]}"'
- retry gem install knapsack - retry gem install knapsack
......
...@@ -50,11 +50,6 @@ RSpec.configure do |config| ...@@ -50,11 +50,6 @@ RSpec.configure do |config|
example.run example.run
Rails.cache = caching_store Rails.cache = caching_store
end end
config.after(:each) do
FileUtils.rm_rf("tmp/tests/repositories")
FileUtils.mkdir_p("tmp/tests/repositories")
end
end end
FactoryGirl::SyntaxRunner.class_eval do FactoryGirl::SyntaxRunner.class_eval do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment