diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-03-30 18:16:16 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-03-30 18:16:16 +0000 |
| commit | 40a94eb71b3084a8cccb1d633541064a090d0058 (patch) | |
| tree | f8bd23d53787cfe0762b2c382592082d82a32eaa | |
| parent | 8f93280e8f71b73a5e5d5a82ab1d029a74c57477 (diff) | |
| parent | 8a0753a55a1ba9829c314baf3a6569a8ab407e44 (diff) | |
| download | gitlab-ce-40a94eb71b3084a8cccb1d633541064a090d0058.tar.gz | |
Merge branch '30284-fix-repo-clean-rules' into 'master'
Don't clean up the gitlab-test-fork_bare repo
Closes #30284
See merge request !10342
| -rw-r--r-- | spec/support/test_env.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb index 54e222e44bf..78be23bd853 100644 --- a/spec/support/test_env.rb +++ b/spec/support/test_env.rb @@ -40,7 +40,7 @@ module TestEnv 'csv' => '3dd0896', 'v1.1.0' => 'b83d6e3' }.freeze - + # gitlab-test-fork is a fork of gitlab-fork, but we don't necessarily # need to keep all the branches in sync. # We currently only need a subset of the branches @@ -92,7 +92,7 @@ module TestEnv tmp_test_path = Rails.root.join('tmp', 'tests', '**') Dir[tmp_test_path].each do |entry| - unless File.basename(entry) =~ /\Agitlab-(shell|test|test_bare|test-fork)\z/ + unless File.basename(entry) =~ /\Agitlab-(shell|test|test_bare|test-fork|test-fork_bare)\z/ FileUtils.rm_rf(entry) end end |