summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2016-11-21 14:57:03 -0800
committerLamont Granquist <lamont@scriptkiddie.org>2016-11-21 14:57:03 -0800
commitee7e537e4952151e19f4fbdd924a71eabc940647 (patch)
tree8f9185a2143d80220a3f6551d34e6eb00deb55fe
parent82589b9e40ecfa5602b4bc6a2ca864807172d8fb (diff)
downloadchef-lcg/amazonlinux.tar.gz
remove sysbench, add 'amazon' familylcg/amazonlinux
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
-rw-r--r--kitchen-tests/cookbooks/base/recipes/packages.rb2
-rw-r--r--kitchen-tests/test/integration/webapp/default_spec.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/kitchen-tests/cookbooks/base/recipes/packages.rb b/kitchen-tests/cookbooks/base/recipes/packages.rb
index 92390f0942..c4457e5945 100644
--- a/kitchen-tests/cookbooks/base/recipes/packages.rb
+++ b/kitchen-tests/cookbooks/base/recipes/packages.rb
@@ -1,7 +1,7 @@
# this is just a list of package that exist on every O/S we test, and often aren't installed by default. you don't
# have to get too clever here, you can delete packages if they don't exist everywhere we test.
-pkgs = %w{lsof tcpdump strace zsh dmidecode ltrace bc curl wget telnet subversion git traceroute htop tmux sysbench }
+pkgs = %w{lsof tcpdump strace zsh dmidecode ltrace bc curl wget telnet subversion git traceroute htop tmux }
# this deliberately calls the multipackage API N times in order to do one package installation in order to exercise the
# multipackage cookbook.
diff --git a/kitchen-tests/test/integration/webapp/default_spec.rb b/kitchen-tests/test/integration/webapp/default_spec.rb
index 1e5004cd3e..cf148218b7 100644
--- a/kitchen-tests/test/integration/webapp/default_spec.rb
+++ b/kitchen-tests/test/integration/webapp/default_spec.rb
@@ -12,7 +12,7 @@ when "debian", "ubuntu"
ssh_package = "openssh-client"
ssh_service = "ssh"
ntp_service = "ntp"
-when "centos", "redhat", "fedora"
+when "centos", "redhat", "fedora", "amazon"
ssh_package = "openssh-clients"
ssh_service = "sshd"
ntp_service = "ntpd"
@@ -91,7 +91,7 @@ describe package("autoconf") do
it { should be_installed }
end
-%w{lsof tcpdump strace zsh dmidecode ltrace bc curl wget telnet subversion git traceroute htop tmux sysbench }.each do |pkg|
+%w{lsof tcpdump strace zsh dmidecode ltrace bc curl wget telnet subversion git traceroute htop tmux }.each do |pkg|
describe package pkg do
it { should be_installed }
end