diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-09-27 12:01:42 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-09-27 12:01:42 +0000 |
| commit | 6606874738ac981d26d03fea049fc1a88402b8f4 (patch) | |
| tree | e152ea889429a46c78e5b69f158297b6ffc047c4 | |
| parent | da7353d36c261885b77cf952ee3fff2c312ea199 (diff) | |
| parent | bc8dcbf16c9fdf8a4ca8dfc74b8febcc1aa2da9e (diff) | |
| download | gitlab-ce-6606874738ac981d26d03fea049fc1a88402b8f4.tar.gz | |
Merge branch '38378-testenv-can-t-handle-component-versions-with-a-branch-name-in-ci' into 'master'
Fix component update with branch specifiers on CI
Closes #38378
See merge request gitlab-org/gitlab-ce!14494
| -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) |