summaryrefslogtreecommitdiff
path: root/kitchen-tests
diff options
context:
space:
mode:
authorMatt Wrock <matt@mattwrock.com>2016-10-04 17:39:04 -0700
committerMatt Wrock <matt@mattwrock.com>2016-10-04 17:39:04 -0700
commitdbcd5960df7bec1a6d3de47c861e50af751b26ad (patch)
treeb5016a3873ef4880ff8aaac00916a856d1d43573 /kitchen-tests
parent1cdd613855778050dee83fbc17cced869e9a7c5c (diff)
downloadchef-dbcd5960df7bec1a6d3de47c861e50af751b26ad.tar.gz
Fix centos 6 kitchen tests with chef-client 6chef_client
Signed-off-by: Matt Wrock <matt@mattwrock.com>
Diffstat (limited to 'kitchen-tests')
-rw-r--r--kitchen-tests/.kitchen.travis.yml3
-rw-r--r--kitchen-tests/Berksfile.lock2
2 files changed, 4 insertions, 1 deletions
diff --git a/kitchen-tests/.kitchen.travis.yml b/kitchen-tests/.kitchen.travis.yml
index 9c5854d923..d73b41368d 100644
--- a/kitchen-tests/.kitchen.travis.yml
+++ b/kitchen-tests/.kitchen.travis.yml
@@ -62,6 +62,9 @@ platforms:
- RUN yum clean all
- RUN yum -y install which initscripts net-tools sudo wget
- RUN sed -i -e "s/Defaults.*requiretty.*/Defaults !requiretty/g" /etc/sudoers
+ attributes:
+ chef_client:
+ init_style: init
- name: centos-7
driver:
diff --git a/kitchen-tests/Berksfile.lock b/kitchen-tests/Berksfile.lock
index 0a60ca95f6..518aa56fac 100644
--- a/kitchen-tests/Berksfile.lock
+++ b/kitchen-tests/Berksfile.lock
@@ -33,7 +33,7 @@ GRAPH
compat_resource (>= 12.14)
mingw (>= 1.1)
seven_zip (>= 0.0.0)
- chef-client (5.0.0)
+ chef-client (6.0.0)
cron (>= 1.7.0)
logrotate (>= 1.9.0)
windows (>= 1.42.0)