Merge pull request #37 from hardening-io/update-common

update common kitchen.yml platforms (ansible), kitchen_debian.yml platforms (ansible)

Author: Sebastian Gumprich

.kitchen.yml

@@ -1,29 +1,27 @@
 ---
 driver:
   name: vagrant
-
 provisioner:
   name: ansible_playbook
   test_repo_uri: https://github.com/TelekomLabs/tests-os-hardening.git
   hosts: all
-
 platforms:
 - name: ubuntu-12.04
   driver_config:
     box: opscode-ubuntu-12.04
-    box_url: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.04_chef-provisionerless.box
+    box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.04_chef-provisionerless.box
 - name: ubuntu-14.04
   driver_config:
     box: opscode-ubuntu-14.04
-    box_url: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-14.04_chef-provisionerless.box
+    box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-14.04_chef-provisionerless.box
 - name: centos-6.4
   driver_config:
     box: opscode-centos-6.4
     box_url: https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-6.4_provisionerless.box
 - name: centos-6.5
   driver_config:
     box: opscode-centos-6.5
-    box_url: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.5_chef-provisionerless.box
+    box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.5_chef-provisionerless.box
 - name: oracle-6.4
   driver_config:
     box: oracle-6.4
@@ -32,13 +30,14 @@ platforms:
   driver_config:
     box: oracle-6.5
     box_url: https://storage.us2.oraclecloud.com/v1/istoilis-istoilis/vagrant/oel65-64.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
+  ansible_version: 1.9.2
   provisioner:
     playbook: test/integration/playbooks/default.yml

.kitchen_debian.yml

@@ -1,30 +1,33 @@
 ---
 driver:
   name: vagrant
-
 provisioner:
   name: ansible_playbook
   test_repo_uri: https://github.com/TelekomLabs/tests-os-hardening.git
   hosts: all
   require_ansible_omnibus: true
   ansible_omnibus_url: https://raw.githubusercontent.com/hardening-io/ansible-os-hardening/master/ansible-install.sh
-
 platforms:
 - name: debian-6
   driver_config:
     box: debian-6
-    box_url: https://s3.eu-central-1.amazonaws.com/ffuenf-vagrantboxes/debian/debian-6.0.10-amd64_virtualbox.box
+    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://s3.eu-central-1.amazonaws.com/ffuenf-vagrantboxes/debian/debian-7.7.0-amd64_virtualbox.box
-
+    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
+  ansible_version: 1.9.2
   provisioner:
     playbook: test/integration/playbooks/default.yml

ansible-install.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
+sudo apt-get update -y
 sudo apt-get install -y build-essential python-dev python-setuptools
 cd /tmp && wget http://releases.ansible.com/ansible/ansible-latest.tar.gz
 tar xzf ansible-latest.tar.gz
 cd ansible-* && sudo python setup.py install
-