diff options
| author | Tim Smith <tsmith84@gmail.com> | 2019-10-02 10:03:54 -0700 |
|---|---|---|
| committer | Tim Smith <tsmith84@gmail.com> | 2019-10-02 10:03:54 -0700 |
| commit | 00f915a4ead95f40b2eb716f99f2357fd98dc899 (patch) | |
| tree | 69c846bdebd926c542e6140ac71bfb42c217e047 | |
| parent | 7020508733a345f63b6e453cda867fbd6e525837 (diff) | |
| download | chef-00f915a4ead95f40b2eb716f99f2357fd98dc899.tar.gz | |
Update the kitchen tests
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | kitchen-tests/cookbooks/end_to_end/attributes/default.rb | 2 | ||||
| -rw-r--r-- | kitchen-tests/cookbooks/end_to_end/recipes/default.rb | 17 | ||||
| -rw-r--r-- | kitchen-tests/cookbooks/end_to_end/recipes/packages.rb | 2 |
3 files changed, 14 insertions, 7 deletions
diff --git a/kitchen-tests/cookbooks/end_to_end/attributes/default.rb b/kitchen-tests/cookbooks/end_to_end/attributes/default.rb index 5e8cee6736..50fbdfaea1 100644 --- a/kitchen-tests/cookbooks/end_to_end/attributes/default.rb +++ b/kitchen-tests/cookbooks/end_to_end/attributes/default.rb @@ -73,4 +73,4 @@ default["resolver"]["search"] = "chef.io" # nscd cookbook overrides # -default["nscd"]["server_user"] = "nobody" +default["nscd"]["server_user"] = "nobody" unless platform_family?("suse") # this breaks SLES 15 diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/default.rb b/kitchen-tests/cookbooks/end_to_end/recipes/default.rb index 2779ed92fc..0cd7cc2e00 100644 --- a/kitchen-tests/cookbooks/end_to_end/recipes/default.rb +++ b/kitchen-tests/cookbooks/end_to_end/recipes/default.rb @@ -2,10 +2,10 @@ # Cookbook:: end_to_end # Recipe:: default # -# Copyright:: 2014-2018, Chef Software, Inc. +# Copyright:: 2014-2019, Chef Software, Inc. # -hostname "chef-travis-ci.chef.io" +hostname "chef-bk-ci.chef.io" apt_update @@ -17,13 +17,20 @@ if platform_family?("rhel", "fedora", "amazon") include_recipe "selinux::disabled" end +bash "disable yum metadata caching" do + code <<-EOH + echo http_caching=packages >> /etc/yum.conf + EOH + only_if { File.exist?("/etc/yum.conf") && File.readlines("/etc/yum.conf").grep(/http_caching=packages/).empty? } +end + yum_repository "epel" do enabled true - description "Extra Packages for Enterprise Linux #{node['platform_version'].to_i} - $basearch" + description "Extra Packages for Enterprise Linux #{node["platform_version"].to_i} - $basearch" failovermethod "priority" - gpgkey "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{node['platform_version'].to_i}" + gpgkey "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{node["platform_version"].to_i}" gpgcheck true - mirrorlist "https://mirrors.fedoraproject.org/metalink?repo=epel-#{node['platform_version'].to_i}&arch=$basearch" + mirrorlist "https://mirrors.fedoraproject.org/metalink?repo=epel-#{node["platform_version"].to_i}&arch=$basearch" only_if { platform_family?("rhel") } end diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/packages.rb b/kitchen-tests/cookbooks/end_to_end/recipes/packages.rb index 069487486f..7323bb80c5 100644 --- a/kitchen-tests/cookbooks/end_to_end/recipes/packages.rb +++ b/kitchen-tests/cookbooks/end_to_end/recipes/packages.rb @@ -15,7 +15,7 @@ pkgs.each do |pkg| multipackage pkgs end -gems = %w{fpm community_cookbook_releaser} +gems = %w{chef-ruby-lvm community_cookbook_releaser} gems.each do |gem| chef_gem gem do |