diff options
| author | Alejandro RodrÃguez <alejorro70@gmail.com> | 2017-09-23 18:22:15 -0300 |
|---|---|---|
| committer | Alejandro RodrÃguez <alejorro70@gmail.com> | 2017-09-26 00:31:46 -0300 |
| commit | bc8dcbf16c9fdf8a4ca8dfc74b8febcc1aa2da9e (patch) | |
| tree | 4686f3a06555836ccfbf06bce8cc81305144de27 | |
| parent | 38a848be1c1ea5cba3112def8b3d64a2af056f0e (diff) | |
| download | gitlab-ce-38378-testenv-can-t-handle-component-versions-with-a-branch-name-in-ci.tar.gz | |
Fix component update with branch specifiers on CI38378-testenv-can-t-handle-component-versions-with-a-branch-name-in-ci
| -rw-r--r-- | spec/support/test_env.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb index 6e5b9700b54..b4e8b5ea67b 100644 --- a/spec/support/test_env.rb +++ b/spec/support/test_env.rb @@ -306,6 +306,9 @@ module TestEnv ensure_component_dir_name_is_correct!(component, install_dir) + # On CI, once installed, components never need update + return if File.exist?(install_dir) && ENV['CI'] + if component_needs_update?(install_dir, version) # Cleanup the component entirely to ensure we start fresh FileUtils.rm_rf(install_dir) |