Commit b6757fca authored by Marin Jankovski's avatar Marin Jankovski

Merge branch 'fix-missing-unzip-git-install-rhel' into 'master'

Fix missing unzip git install rhel

This is a re-submit of [MR !61](gitlab-org/cookbook-gitlab!61) without problems mentioned there and with proper spec added proving the fix works.
parents be7da15e e8020fa0
......@@ -4,7 +4,7 @@ default['gitlab']['git']['version'] = "1.8.5.2"
default['gitlab']['git']['url'] = "https://codeload.github.com/git/git/zip/v#{node['gitlab']['git']['version']}"
if platform_family?("rhel")
packages = %w{expat-devel gettext-devel libcurl-devel openssl-devel perl-ExtUtils-MakeMaker zlib-devel}
packages = %w{unzip expat-devel gettext-devel libcurl-devel openssl-devel perl-ExtUtils-MakeMaker zlib-devel}
else
packages = %w{unzip build-essential libcurl4-openssl-dev libexpat1-dev gettext libz-dev libssl-dev}
end
......
......@@ -50,7 +50,7 @@ describe "gitlab::git" do
end
it "installs all git required packages" do
packages = %w{expat-devel gettext-devel libcurl-devel openssl-devel perl-ExtUtils-MakeMaker zlib-devel}
packages = %w{unzip expat-devel gettext-devel libcurl-devel openssl-devel perl-ExtUtils-MakeMaker zlib-devel}
packages.each do |pkg|
expect(chef_run).to install_package(pkg)
end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment