Skip to content

Commit

Permalink
Merge remote-tracking branch 'github/pull/641'
Browse files Browse the repository at this point in the history
  • Loading branch information
tomhughes committed Nov 28, 2023
2 parents f94d131 + 86961f1 commit e7687ba
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 6 deletions.
1 change: 1 addition & 0 deletions .github/workflows/test-kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ jobs:
- bind
- blog
- blogs
- chef
- civicrm
- clamav
- community
Expand Down
3 changes: 3 additions & 0 deletions .kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@ suites:
- name: blogs
run_list:
- recipe[blogs::default]
- name: chef
run_list:
- recipe[chef::default]
- name: civicrm
run_list:
- recipe[civicrm::default]
Expand Down
18 changes: 12 additions & 6 deletions cookbooks/chef/recipes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,18 @@
"amd64"
end

os_release = if platform?("debian") && node[:lsb][:release].to_f > 11
11
else
node[:lsb][:release]
end

# Chef is currently not available for Debian 11 on arm64.
if chef_platform == "debian" && os_release == 11 && chef_arch == "arm64"
chef_platform = "ubuntu"
os_release = "22.04"
end

chef_package = "chef_#{chef_version}-1_#{chef_arch}.deb"

directory "/var/cache/chef" do
Expand All @@ -49,12 +61,6 @@
end
end

os_release = if platform?("debian") && node[:lsb][:release].to_f > 11
11
else
node[:lsb][:release]
end

remote_file "#{cache_dir}/#{chef_package}" do
source "https://packages.chef.io/files/stable/chef/#{chef_version}/#{chef_platform}/#{os_release}/#{chef_package}"
owner "root"
Expand Down
17 changes: 17 additions & 0 deletions test/integration/chef/inspec/chef_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
describe package("chef") do
it { should be_installed }
end

describe systemd_service("chef-client") do
it { should be_installed }
end

describe systemd_service("chef-client.timer") do
it { should be_installed }
it { should be_enabled }
end

describe command("chef-client --version") do
its("exit_status") { should eq 0 }
its("stdout") { should match /Chef Infra Client/ }
end

0 comments on commit e7687ba

Please sign in to comment.