Skip to content

Commit accdeec

Browse files
author
Sebastian Gumprich
committed
Local testing with Docker
This PR changes the local testing method to docker by default, making the tests significantly faster to execute.
1 parent c5d9770 commit accdeec

File tree

3 files changed

+19
-26
lines changed

3 files changed

+19
-26
lines changed

.kitchen.vagrant.yml

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
---
22
driver:
33
name: vagrant
4+
45
provisioner:
56
name: ansible_playbook
6-
test_repo_uri: https://github.com/hardening-io/tests-ssh-hardening.git
7+
test_repo_uri: https://github.com/hardening-io/tests-os-hardening.git
78
hosts: all
89
require_ansible_repo: false
910
require_ansible_omnibus: true
1011
require_chef_for_busser: false
1112
require_ruby_for_busser: false
13+
ansible_verbose: true
14+
roles_path: ../ansible-os-hardening/
15+
playbook: default.yml
16+
1217
platforms:
1318
- name: ubuntu-12.04
1419
driver_config:
@@ -34,10 +39,6 @@ platforms:
3439
driver_config:
3540
box: oracle-6.5
3641
box_url: https://storage.us2.oraclecloud.com/v1/istoilis-istoilis/vagrant/oel65-64.box
37-
- name: debian-6
38-
driver_config:
39-
box: debian-6
40-
box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-6.0.10_chef-provisionerless.box
4142
- name: debian-7
4243
driver_config:
4344
box: debian-7
@@ -46,22 +47,15 @@ platforms:
4647
driver_config:
4748
box: debian-8
4849
box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-8.1_chef-provisionerless.box
50+
4951
verifier:
5052
name: inspec
53+
sudo: true
54+
inspec_tests:
55+
- https://github.com/dev-sec/tests-os-hardening
56+
5157
suites:
52-
- name: ansible_1.9
53-
hosts: all
54-
ansible_verbose: true
55-
ansible_diff: true
56-
roles_path: ../ansible-ssh-hardening/
58+
- name: os-ansible_1.9
5759
provisioner:
58-
playbook: test/integration/playbooks/default.yml
5960
ansible_version: 1.9.4
60-
- name: ansible_latest
61-
hosts: all
62-
ansible_verbose: true
63-
ansible_diff: true
64-
roles_path: ../ansible-ssh-hardening/
65-
provisioner:
66-
playbook: test/integration/playbooks/default.yml
67-
61+
- name: os-ansible_latest

.kitchen.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@ platforms:
3131
- name: ubuntu-14.04
3232
driver:
3333
image: ubuntu:14.04
34-
- name: ubuntu-15.10
35-
driver:
36-
image: ubuntu:15.10
3734
- name: ubuntu-16.04
3835
driver:
3936
image: ubuntu:16.04
@@ -57,6 +54,12 @@ platforms:
5754
driver:
5855
image: debian:8
5956

57+
verifier:
58+
name: inspec
59+
sudo: true
60+
inspec_tests:
61+
- https://github.com/dev-sec/tests-os-hardening
62+
6063
suites:
6164
- name: os_ansible_1.9
6265
provisioner:

README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,6 @@ Next install test-kitchen:
147147
# Install dependencies
148148
gem install bundler
149149
bundle install
150-
151-
# Fetch tests
152-
bundle exec thor kitchen:fetch-remote-tests
153-
154150
```
155151

156152
### Testing with Docker

0 commit comments

Comments
 (0)