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
This commit is contained in:
Rémy Coutable 2017-09-27 12:01:42 +00:00
commit 6606874738

View file

@ -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)