From b1a550171554742faf81f7a6225e2f16ff4ea277 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= <raphael.pinson@camptocamp.com> Date: Wed, 9 Aug 2017 12:15:51 +0200 Subject: [PATCH] Modulesync --- .travis.yml | 4 ++-- spec/acceptance/nodesets/centos-5.yml | 2 +- spec/acceptance/nodesets/debian-9.yml | 15 +++++++++++++++ spec/acceptance/nodesets/ubuntu-16.04.yml | 2 +- 4 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 spec/acceptance/nodesets/debian-9.yml diff --git a/.travis.yml b/.travis.yml index 5e132df..f79990f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,8 +15,8 @@ matrix: include: - rvm: 2.1.9 env: PUPPET_GEM_VERSION="~> 4.0" - - rvm: 2.3.1 - env: PUPPET_GEM_VERSION="~> 4" + - rvm: 2.4.1 + env: PUPPET_GEM_VERSION="~> 5.0" - rvm: default sudo: required dist: trusty diff --git a/spec/acceptance/nodesets/centos-5.yml b/spec/acceptance/nodesets/centos-5.yml index a26f27f..ad2b01c 100644 --- a/spec/acceptance/nodesets/centos-5.yml +++ b/spec/acceptance/nodesets/centos-5.yml @@ -5,7 +5,7 @@ HOSTS: strict_variables: platform: el-5-x86_64 hypervisor : docker - image: tianon/centos:5.10 + image: camptocamp/centos:5 docker_preserve_image: true docker_cmd: '["/sbin/init"]' docker_image_commands: diff --git a/spec/acceptance/nodesets/debian-9.yml b/spec/acceptance/nodesets/debian-9.yml new file mode 100644 index 0000000..f1c6571 --- /dev/null +++ b/spec/acceptance/nodesets/debian-9.yml @@ -0,0 +1,15 @@ +HOSTS: + debian-9-x64: + default_apply_opts: + order: random + strict_variables: + platform: debian-9-amd64 + hypervisor : docker + image: debian:9 + docker_preserve_image: true + docker_cmd: '["/sbin/init"]' + docker_image_commands: + - 'apt-get install -y cron locales-all net-tools systemd-sysv wget' +CONFIG: + type: aio + log_level: debug diff --git a/spec/acceptance/nodesets/ubuntu-16.04.yml b/spec/acceptance/nodesets/ubuntu-16.04.yml index 6c32b96..561ebd7 100644 --- a/spec/acceptance/nodesets/ubuntu-16.04.yml +++ b/spec/acceptance/nodesets/ubuntu-16.04.yml @@ -9,7 +9,7 @@ HOSTS: docker_preserve_image: true docker_cmd: '["/sbin/init"]' docker_image_commands: - - 'apt-get install -y net-tools wget' + - 'apt-get install -y net-tools wget locales' - 'locale-gen en_US.UTF-8' CONFIG: type: aio -- GitLab