Skip to content

Commit

Permalink
fix amazonlinux cairo installs, add service inspec tests
Browse files Browse the repository at this point in the history
  • Loading branch information
jtschelling committed Jul 6, 2020
1 parent b96cd11 commit 5f47e08
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 9 deletions.
2 changes: 1 addition & 1 deletion attributes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
case node['platform_family']
when 'debian'
%w(libcairo2-dev libffi-dev python-rrdtool)
when 'rhel'
when 'rhel', 'amazon'
%w(cairo-devel libffi-devel python-rrdtool bitmap-fonts)
else
[]
Expand Down
12 changes: 7 additions & 5 deletions kitchen.dokken.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@ verifier:
name: inspec

platforms:
- name: amazonlinux
driver:
image: dokken/amazonlinux
pid_one_command: /sbin/init

- name: amazonlinux-2
driver:
image: dokken/amazonlinux-2
Expand All @@ -40,6 +35,13 @@ platforms:
intermediate_instructions:
- RUN /usr/bin/apt-get update

- name: debian-10
driver:
image: dokken/debian-10
pid_one_command: /bin/systemd
intermediate_instructions:
- RUN /usr/bin/apt-get update

- name: centos-7
driver:
image: dokken/centos-7
Expand Down
4 changes: 1 addition & 3 deletions kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@ verifier:
name: inspec

platforms:
- name: amazonlinux
driver_config:
box: mvbcoding/awslinux
- name: amazonlinux-2
- name: centos-7
- name: debian-8
- name: debian-9
Expand Down
4 changes: 4 additions & 0 deletions test/integration/default/carbon_cache_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
describe systemd_service('carbon-cache') do
it { should be_enabled }
it { should be_running }
end
4 changes: 4 additions & 0 deletions test/integration/default/graphite_web_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
describe systemd_service('graphite-web') do
it { should be_enabled }
it { should be_running }
end

0 comments on commit 5f47e08

Please sign in to comment.