kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '32762-gitaly-should-be-recompiled-when-gitaly_server_version-changes' into 'master'

Browse source 
Recompile test env Gitaly when `GITALY_SERVER_VERSION` fails

Closes #32762

See merge request !11664
This commit is contained in:
Robert Speicher 2017-05-25 16:53:51 +00:00
commit 43c3614ebf
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
spec/support/test_env.rb
View file

@ -123,7 +123,7 @@ module TestEnv
socket_path = Gitlab::GitalyClient.address('default').sub(/\Aunix:/, '')
gitaly_dir = File.dirname(socket_path)
unless File.directory?(gitaly_dir) || system('rake', "gitlab:gitaly:install[#{gitaly_dir}]")
unless !gitaly_needs_update?(gitaly_dir) || system('rake', "gitlab:gitaly:install[#{gitaly_dir}]")
raise "Can't clone gitaly"
end
@ -252,4 +252,15 @@ module TestEnv
cleanup && init unless reset.call
end
end
def gitaly_needs_update?(gitaly_dir)
gitaly_version = File.read(File.join(gitaly_dir, '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
rescue Errno::ENOENT
true
end
end