diff options
author | Alejandro RodrÃguez <alejorro70@gmail.com> | 2017-06-19 17:06:17 -0400 |
---|---|---|
committer | Alejandro RodrÃguez <alejorro70@gmail.com> | 2017-06-19 17:06:17 -0400 |
commit | b4e1529e57e28dade05e307c7a3ff508c2d54f50 (patch) | |
tree | 7c741015a53536103cbcfc2736ca1f254e364e82 /spec | |
parent | e4eeba4e4b33c327d5c95a48103ab5781d15c77c (diff) | |
download | gitlab-ce-b4e1529e57e28dade05e307c7a3ff508c2d54f50.tar.gz |
Reinstall shell on the test env if it's outdatedshell-test-rebuild
Diffstat (limited to 'spec')
-rw-r--r-- | spec/support/test_env.rb | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb index 3f472e59c49..6d71dd476c3 100644 --- a/spec/support/test_env.rb +++ b/spec/support/test_env.rb @@ -120,18 +120,21 @@ module TestEnv end def setup_gitlab_shell - unless File.directory?(Gitlab.config.gitlab_shell.path) - unless system('rake', 'gitlab:shell:install') - raise 'Can`t clone gitlab-shell' - end + shell_needs_update = component_needs_update?(Gitlab.config.gitlab_shell.path, + Gitlab::Shell.version_required) + + unless !shell_needs_update || system('rake', 'gitlab:shell:install') + raise 'Can`t clone gitlab-shell' end end def setup_gitaly socket_path = Gitlab::GitalyClient.address('default').sub(/\Aunix:/, '') gitaly_dir = File.dirname(socket_path) + gitaly_needs_update = component_needs_update?(gitaly_dir, + Gitlab::GitalyClient.expected_server_version) - unless !gitaly_needs_update?(gitaly_dir) || system('rake', "gitlab:gitaly:install[#{gitaly_dir}]") + unless !gitaly_needs_update || system('rake', "gitlab:gitaly:install[#{gitaly_dir}]") raise "Can't clone gitaly" end @@ -261,13 +264,13 @@ module TestEnv end end - def gitaly_needs_update?(gitaly_dir) - gitaly_version = File.read(File.join(gitaly_dir, 'VERSION')).strip + def component_needs_update?(component_folder, expected_version) + version = File.read(File.join(component_folder, 'VERSION')).strip # Notice that this will always yield true when using branch versions # (`=branch_name`), but that actually makes sure the server is always based # on the latest branch revision. - gitaly_version != Gitlab::GitalyClient.expected_server_version + version != expected_version rescue Errno::ENOENT true end |