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

Merge branch '38378-testenv-can-t-handle-component-versions-with-a-branch-name-in-ci' into 'master'
66068747 · Rémy Coutable · da7353d3 · bc8dcbf1 · 66068747
Commit 66068747 authored Sep 27, 2017 by Rémy Coutable
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

test_env.rb spec/support/test_env.rb +3 -0

No files found.
--- 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)