Skip to content

Commit

Permalink
Local testing with Docker
Browse files Browse the repository at this point in the history
This PR changes the local testing method to docker by default, making
the tests significantly faster to execute.
  • Loading branch information
Sebastian Gumprich committed Jun 28, 2016
1 parent c5d9770 commit accdeec
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 26 deletions.
32 changes: 13 additions & 19 deletions .kitchen.vagrant.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
---
driver:
name: vagrant

provisioner:
name: ansible_playbook
test_repo_uri: https://github.com/hardening-io/tests-ssh-hardening.git
test_repo_uri: https://github.com/hardening-io/tests-os-hardening.git
hosts: all
require_ansible_repo: false
require_ansible_omnibus: true
require_chef_for_busser: false
require_ruby_for_busser: false
ansible_verbose: true
roles_path: ../ansible-os-hardening/
playbook: default.yml

platforms:
- name: ubuntu-12.04
driver_config:
Expand All @@ -34,10 +39,6 @@ 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
Expand All @@ -46,22 +47,15 @@ platforms:
driver_config:
box: debian-8
box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-8.1_chef-provisionerless.box

verifier:
name: inspec
sudo: true
inspec_tests:
- https://github.com/dev-sec/tests-os-hardening

suites:
- name: ansible_1.9
hosts: all
ansible_verbose: true
ansible_diff: true
roles_path: ../ansible-ssh-hardening/
- name: os-ansible_1.9
provisioner:
playbook: test/integration/playbooks/default.yml
ansible_version: 1.9.4
- name: ansible_latest
hosts: all
ansible_verbose: true
ansible_diff: true
roles_path: ../ansible-ssh-hardening/
provisioner:
playbook: test/integration/playbooks/default.yml

- name: os-ansible_latest
9 changes: 6 additions & 3 deletions .kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ platforms:
- name: ubuntu-14.04
driver:
image: ubuntu:14.04
- name: ubuntu-15.10
driver:
image: ubuntu:15.10
- name: ubuntu-16.04
driver:
image: ubuntu:16.04
Expand All @@ -57,6 +54,12 @@ platforms:
driver:
image: debian:8

verifier:
name: inspec
sudo: true
inspec_tests:
- https://github.com/dev-sec/tests-os-hardening

suites:
- name: os_ansible_1.9
provisioner:
Expand Down
4 changes: 0 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -147,10 +147,6 @@ Next install test-kitchen:
# Install dependencies
gem install bundler
bundle install

# Fetch tests
bundle exec thor kitchen:fetch-remote-tests

```

### Testing with Docker
Expand Down

0 comments on commit accdeec

Please sign in to comment.