Skip to content

Commit 3643e70

Browse files
author
Richard Pijnenburg
committed
Merge pull request elastic#32 from electrical/fix_testing
Make the testing work again
2 parents b2d0989 + 7727a7e commit 3643e70

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

.kitchen.yml

+9-10
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ platforms:
1616
privileged: true
1717
provision_command:
1818
- apt-get update && apt-get install -y software-properties-common && add-apt-repository -y ppa:ansible/ansible
19-
- apt-get update && apt-get -y -q install ansible python-apt python-pycurl ruby
19+
- apt-get update && apt-get -y -q install ansible python-apt python-pycurl
2020
use_sudo: false
2121
- name: debian-7
2222
driver_config:
@@ -25,17 +25,17 @@ platforms:
2525
provision_command:
2626
- echo 'deb http://http.debian.net/debian/ wheezy-backports main' >> /etc/apt/sources.list
2727
- apt-get update
28-
- apt-get install -y -q ansible ruby
28+
- apt-get install -y -q ansible
2929
use_sudo: false
3030
- name: debian-8
3131
driver_config:
3232
image: electrical/debian:8
3333
privileged: true
34-
provision_command: apt-get -y -q install ansible ruby
34+
provision_command: apt-get -y -q install ansible
3535
use_sudo: false
3636
- name: centos-6
3737
driver_config:
38-
image: electrical/centos:6.4
38+
image: electrical/centos:6.4-1
3939
privileged: true
4040
use_sudo: false
4141
- name: centos-7
@@ -44,16 +44,15 @@ platforms:
4444
provision_command:
4545
- sed -ri 's/^#?PermitRootLogin .*/PermitRootLogin yes/' /etc/ssh/sshd_config
4646
- sed -ri 's/^#?PasswordAuthentication .*/PasswordAuthentication yes/' /etc/ssh/sshd_config
47-
- yum -y install initscripts ruby
48-
- BUSSER_ROOT="/tmp/verifier" GEM_HOME="/tmp/verifier/gems" GEM_PATH="/tmp/verifier/gems" GEM_CACHE="/tmp/verifier/gems/cache" gem install --no-rdoc --no-ri rake
49-
- chown kitchen:kitchen /tmp/verifier -R
47+
- sed -ri 's/^#?UsePAM .*/UsePAM no/' /etc/ssh/sshd_config
48+
- yum -y install initscripts
49+
# - BUSSER_ROOT="/tmp/verifier" GEM_HOME="/tmp/verifier/gems" GEM_PATH="/tmp/verifier/gems" GEM_CACHE="/tmp/verifier/gems/cache" gem install --no-rdoc --no-ri rake
50+
# - chown kitchen:kitchen /tmp/verifier -R
5051
- yum clean all
52+
run_command: "/usr/sbin/init"
5153
privileged: true
5254
use_sudo: false
5355

54-
verifier:
55-
ruby_bindir: '/usr/bin'
56-
5756
suites:
5857
- name: standard
5958
provisioner:

0 commit comments

Comments
 (0)