From 7725b10d1fd6bc33fbc0cfd2ab57096c1b6635fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Thu, 23 Apr 2015 09:04:29 +0200 Subject: Add Puppet 4 to travis matrix --- spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml (limited to 'spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml') diff --git a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml new file mode 100644 index 0000000..744e027 --- /dev/null +++ b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml @@ -0,0 +1,12 @@ +HOSTS: + ubuntu-1404-x64: + default_apply_opts: + strict_variables: + 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 +CONFIG: + type: foss + log_level: debug -- cgit v1.2.3 From 46ef1fc76e6609e9c78dfd2552bb3b9ea647ae66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Tue, 26 May 2015 16:27:14 +0200 Subject: Use random application order in nodeset --- spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml | 1 + 1 file changed, 1 insertion(+) (limited to 'spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml') 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 744e027..7716f94 100644 --- a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml +++ b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml @@ -1,6 +1,7 @@ HOSTS: ubuntu-1404-x64: default_apply_opts: + order: random strict_variables: platform: ubuntu-14.04-amd64 hypervisor : docker -- cgit v1.2.3 From 7477ae8985d7615681443b4f3702014657981fab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Fri, 21 Aug 2015 07:49:28 +0200 Subject: Use docker for acceptance tests --- spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml') 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 7716f94..6fb9281 100644 --- 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 -- cgit v1.2.3