Use docker for acceptance tests

diff --git a/.gitignore b/.gitignore
index b5b7a00d67a1c996abfcbb460a9d59f23d1a1f0e..65839fa010a2b31f979bfcf0161e33db978e3770 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,6 @@ spec/fixtures/
 .vagrant/
 .bundle/
 coverage/
+log/
+.*.swp
+*~

diff --git a/.travis.yml b/.travis.yml
index 2fb78c825452aea36d2333cc5a8b3e427d47cba3..572abfd700ff4d7c134a5eaf6ae4d63e0280e3b6 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,7 @@ matrix:
     env: PUPPET_GEM_VERSION="~> 3.0"
   - rvm: 2.0.0
     env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
-  - rvm: 2.1.0
+  - rvm: 2.1.6
     env: PUPPET_GEM_VERSION="~> 4.0"
 notifications:
   email: false

diff --git a/spec/acceptance/nodesets/centos-5-x86_64-docker.yml b/spec/acceptance/nodesets/centos-5-x86_64-docker.yml
index d9a52d83eb09f180ed5ff4b133aaf940d2ff0a7e..679afb04d892bfa2c6e26e8e385e794eef15f07a 100644 (file)
--- a/spec/acceptance/nodesets/centos-5-x86_64-docker.yml
+++ b/spec/acceptance/nodesets/centos-5-x86_64-docker.yml
@@ -6,8 +6,10 @@ HOSTS:
     platform: el-5-x86_64
     hypervisor : docker
     image: centos:5
-    # This stops the image from being deleted on completion, speeding up the process.
     docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - 'yum install -y crontabs tar wget'
 CONFIG:
   type: foss
   log_level: debug

diff --git a/spec/acceptance/nodesets/centos-6-x86_64-docker.yml b/spec/acceptance/nodesets/centos-6-x86_64-docker.yml
index b7a4396fd969fb42c3b3356eef0543f5128afa22..9cab03d08d3affa46d58ead104611bccda490da9 100644 (file)
--- a/spec/acceptance/nodesets/centos-6-x86_64-docker.yml
+++ b/spec/acceptance/nodesets/centos-6-x86_64-docker.yml
@@ -6,8 +6,10 @@ HOSTS:
     platform: el-6-x86_64
     hypervisor : docker
     image: centos:6
-    # This stops the image from being deleted on completion, speeding up the process.
     docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - 'yum install -y crontabs tar wget'
 CONFIG:
   type: foss
   log_level: debug

diff --git a/spec/acceptance/nodesets/centos-7-x86_64-docker.yml b/spec/acceptance/nodesets/centos-7-x86_64-docker.yml
index d891edf0b014f6375e8ecc460b95d850981b33b7..0bc972711c90e6672152fb4e976cfbd7e07ffedb 100644 (file)
--- a/spec/acceptance/nodesets/centos-7-x86_64-docker.yml
+++ b/spec/acceptance/nodesets/centos-7-x86_64-docker.yml
@@ -6,8 +6,10 @@ HOSTS:
     platform: el-7-x86_64
     hypervisor : docker
     image: centos:7
-    # This stops the image from being deleted on completion, speeding up the process.
     docker_preserve_image: true
+    docker_cmd: '["/usr/sbin/init"]'
+    docker_image_commands:
+      - 'yum install -y crontabs tar wget'
 CONFIG:
   type: foss
   log_level: debug

diff --git a/spec/acceptance/nodesets/debian-6-x86_64-docker.yml b/spec/acceptance/nodesets/debian-6-x86_64-docker.yml
index 685e2b712a4c02bd8e2bad03714aeee743e5e3cd..359dae7dc66e3f7dfd227f9dac947b3381c700d0 100644 (file)
--- a/spec/acceptance/nodesets/debian-6-x86_64-docker.yml
+++ b/spec/acceptance/nodesets/debian-6-x86_64-docker.yml
@@ -6,8 +6,10 @@ HOSTS:
     platform: debian-6-amd64
     hypervisor : docker
     image: debian:6
-    # This stops the image from being deleted on completion, speeding up the process.
     docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - 'apt-get install -y wget'
 CONFIG:
   type: foss
   log_level: debug

diff --git a/spec/acceptance/nodesets/debian-7-x86_64-docker.yml b/spec/acceptance/nodesets/debian-7-x86_64-docker.yml
index 0be8845801b757b5be9349f9d3a4ce4266341ccf..fc11f5748abda4a8a4a0c92241b0d0cb5a1f5fdd 100644 (file)
--- a/spec/acceptance/nodesets/debian-7-x86_64-docker.yml
+++ b/spec/acceptance/nodesets/debian-7-x86_64-docker.yml
@@ -6,8 +6,10 @@ HOSTS:
     platform: debian-7-amd64
     hypervisor : docker
     image: debian:7
-    # This stops the image from being deleted on completion, speeding up the process.
     docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - 'apt-get install -y cron wget'
 CONFIG:
   type: foss
   log_level: debug

diff --git a/spec/acceptance/nodesets/debian-8-x86_64-docker.yml b/spec/acceptance/nodesets/debian-8-x86_64-docker.yml
index d3b89d9e3d2b430cd6335542e68d4848c435f039..86a55e156924cea2997448b4eb15a5f9d4f53679 100644 (file)
--- a/spec/acceptance/nodesets/debian-8-x86_64-docker.yml
+++ b/spec/acceptance/nodesets/debian-8-x86_64-docker.yml
@@ -6,8 +6,10 @@ HOSTS:
     platform: debian-8-amd64
     hypervisor : docker
     image: debian:8
-    # This stops the image from being deleted on completion, speeding up the process.
     docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - 'apt-get install -y cron wget'
 CONFIG:
   type: foss
   log_level: debug

diff --git a/spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml
index 92a790129ff8a3d7f5db1e4337af6f0628dd8be4..f0ec72b86ef254ad92c05db13057dc0531c1eaa6 100644 (file)
--- a/spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml
+++ b/spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml
@@ -6,8 +6,10 @@ HOSTS:
     platform: ubuntu-12.04-amd64
     hypervisor : docker
     image: ubuntu:12.04
-    # This stops the image from being deleted on completion, speeding up the process.
     docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - 'apt-get install -y wget'
 CONFIG:
   type: foss
   log_level: debug

diff --git a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml
index 7716f9413e2b25a163c76408f89c45f5dd0e6cbf..6fb9281e5d64fb68d1387fbd07d4f34118794413 100644 (file)
--- a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml
+++ b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml
@@ -6,8 +6,10 @@ HOSTS:
     platform: ubuntu-14.04-amd64
     hypervisor : docker
     image: ubuntu:14.04
-    # This stops the image from being deleted on completion, speeding up the process.
     docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - 'apt-get install -y wget'
 CONFIG:
   type: foss
   log_level: debug

diff --git a/spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml
index 256b004121d1a297991f53264235e1313b053177..2be425c543df7c91f36ab7cb2880c5880a53e4c9 100644 (file)
--- a/spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml
+++ b/spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml
@@ -6,8 +6,10 @@ HOSTS:
     platform: ubuntu-14.10-amd64
     hypervisor : docker
     image: ubuntu:14.10
-    # This stops the image from being deleted on completion, speeding up the process.
     docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - 'apt-get install -y wget'
 CONFIG:
   type: foss
   log_level: debug

diff --git a/spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml
index 800da287edc5c1fa8b02459c08d673c28d5bfc11..caed722c2773332ce02060d2cba6ee3dc627a5fe 100644 (file)
--- a/spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml
+++ b/spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml
@@ -6,8 +6,10 @@ HOSTS:
     platform: ubuntu-15.04-amd64
     hypervisor : docker
     image: ubuntu:15.04
-    # This stops the image from being deleted on completion, speeding up the process.
     docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - 'apt-get install -y wget'
 CONFIG:
   type: foss
   log_level: debug