Skip to content

Commit

Permalink
Merge pull request #40 from hardening-io/update_kitchen-ansible
Browse files Browse the repository at this point in the history
Update kitchen-ansible, remove separate debian install
  • Loading branch information
chris-rock committed Aug 31, 2015
2 parents c49708d + aa5dc8f commit b05517c
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 44 deletions.
15 changes: 14 additions & 1 deletion .kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ provisioner:
name: ansible_playbook
test_repo_uri: https://github.com/TelekomLabs/tests-os-hardening.git
hosts: all
require_ansible_repo: false
require_ansible_omnibus: true
platforms:
- name: ubuntu-12.04
driver_config:
Expand All @@ -30,13 +32,24 @@ platforms:
driver_config:
box: oracle-6.5
box_url: https://storage.us2.oraclecloud.com/v1/istoilis-istoilis/vagrant/oel65-64.box
- name: debian-6
driver_config:
box: debian-6
box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-6.0.10_chef-provisionerless.box
- name: debian-7
driver_config:
box: debian-7
box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.8_chef-provisionerless.box
- name: debian-8
driver_config:
box: debian-8
box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-8.1_chef-provisionerless.box
verifier:
ruby_bindir: '/usr/bin'
suites:
- name: default
roles_path: roles
hosts: all
require_ansible_repo: true
ansible_verbose: true
ansible_version: 1.9.2
provisioner:
Expand Down
33 changes: 0 additions & 33 deletions .kitchen_debian.yml

This file was deleted.

5 changes: 1 addition & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,12 +94,9 @@ bundle exec thor kitchen:fetch-remote-tests
# fast test on one machine
bundle exec kitchen test default-ubuntu-1204

# test on all machines except Debian-based machines
# test on all machines
bundle exec kitchen test

# test on Debian-based machines
KITCHEN_YAML=".kitchen_debian.yml" bundle exec kitchen test

# for development
bundle exec kitchen create default-ubuntu-1204
bundle exec kitchen converge default-ubuntu-1204
Expand Down
6 changes: 0 additions & 6 deletions ansible-install.sh

This file was deleted.

0 comments on commit b05517c

Please sign in to comment.