From a7b47d3c99b24ceda31700fbd265767d0757fd34 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Sat, 3 Mar 2018 12:06:28 +0100 Subject: [PATCH 1/3] modulesync 1.8.0 --- .msync.yml | 2 +- .travis.yml | 13 ++++++++----- Gemfile | 2 +- spec/acceptance/nodesets/fedora-25-x64.yml | 2 -- spec/acceptance/nodesets/fedora-26-x64.yml | 16 ++++++++++++++++ spec/acceptance/nodesets/fedora-27-x64.yml | 18 ++++++++++++++++++ 6 files changed, 44 insertions(+), 9 deletions(-) create mode 100644 spec/acceptance/nodesets/fedora-26-x64.yml create mode 100644 spec/acceptance/nodesets/fedora-27-x64.yml diff --git a/.msync.yml b/.msync.yml index 046cac86b..4df90fba4 100644 --- a/.msync.yml +++ b/.msync.yml @@ -1 +1 @@ -modulesync_config_version: '1.7.0' +modulesync_config_version: '1.8.0' diff --git a/.travis.yml b/.travis.yml index 072227ae9..10c5bcf3e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,22 +13,25 @@ matrix: - rvm: 2.1.9 bundler_args: --without system_tests development release env: PUPPET_VERSION="~> 4.0" CHECK=test PARALLEL_TEST_PROCESSORS=12 - - rvm: 2.4.2 + - rvm: 2.4.3 bundler_args: --without system_tests development release env: PUPPET_VERSION="~> 5.0" CHECK=test_with_coveralls - - rvm: 2.4.2 + - rvm: 2.5.0 + bundler_args: --without system_tests development release + env: PUPPET_VERSION="~> 5.0" CHECK=test_with_coveralls + - rvm: 2.4.3 bundler_args: --without system_tests development release env: PUPPET_VERSION="~> 5.0" CHECK=rubocop - - rvm: 2.4.2 + - rvm: 2.4.3 bundler_args: --without system_tests development release env: PUPPET_VERSION="~> 5.0" CHECK=build DEPLOY_TO_FORGE=yes - - rvm: 2.4.2 + - rvm: 2.4.3 bundler_args: --without development release dist: trusty env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/ubuntu-14.04 CHECK=beaker services: docker sudo: required - - rvm: 2.4.2 + - rvm: 2.4.3 bundler_args: --without development release dist: trusty env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/centos-7 CHECK=beaker diff --git a/Gemfile b/Gemfile index 41dc42501..57fcafa19 100644 --- a/Gemfile +++ b/Gemfile @@ -11,7 +11,7 @@ def location_for(place, fake_version = nil) end group :test do - gem 'puppetlabs_spec_helper', '~> 2.5.0', :require => false + gem 'puppetlabs_spec_helper', '~> 2.6.0', :require => false gem 'rspec-puppet', '~> 2.5', :require => false gem 'rspec-puppet-facts', :require => false gem 'rspec-puppet-utils', :require => false diff --git a/spec/acceptance/nodesets/fedora-25-x64.yml b/spec/acceptance/nodesets/fedora-25-x64.yml index 60ae01179..54dd33054 100644 --- a/spec/acceptance/nodesets/fedora-25-x64.yml +++ b/spec/acceptance/nodesets/fedora-25-x64.yml @@ -3,8 +3,6 @@ # https://github.com/voxpupuli/modulesync # https://github.com/voxpupuli/modulesync_config # -# platform is fedora 24 because there is no -# puppet-agent for fedora 25 by 2016-12-30 HOSTS: fedora-25-x64: roles: diff --git a/spec/acceptance/nodesets/fedora-26-x64.yml b/spec/acceptance/nodesets/fedora-26-x64.yml new file mode 100644 index 000000000..598822b0e --- /dev/null +++ b/spec/acceptance/nodesets/fedora-26-x64.yml @@ -0,0 +1,16 @@ +--- +# This file is managed via modulesync +# https://github.com/voxpupuli/modulesync +# https://github.com/voxpupuli/modulesync_config +# +HOSTS: + fedora-26-x64: + roles: + - master + platform: fedora-26-x86_64 + box: fedora/26-cloud-base + hypervisor: vagrant +CONFIG: + type: aio +... +# vim: syntax=yaml diff --git a/spec/acceptance/nodesets/fedora-27-x64.yml b/spec/acceptance/nodesets/fedora-27-x64.yml new file mode 100644 index 000000000..c2b61ebbf --- /dev/null +++ b/spec/acceptance/nodesets/fedora-27-x64.yml @@ -0,0 +1,18 @@ +--- +# This file is managed via modulesync +# https://github.com/voxpupuli/modulesync +# https://github.com/voxpupuli/modulesync_config +# +# platform is fedora 26 because there is no puppet-agent +# for fedora 27 as of 2017-11-17 +HOSTS: + fedora-27-x64: + roles: + - master + platform: fedora-26-x86_64 + box: fedora/27-cloud-base + hypervisor: vagrant +CONFIG: + type: aio +... +# vim: syntax=yaml From e2b0c9b419ab5c102234cc2946bfdc98ce3ecfed Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Sat, 3 Mar 2018 12:07:27 +0100 Subject: [PATCH 2/3] enable ubuntu 16.04 acceptance tests --- .sync.yml | 1 + .travis.yml | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/.sync.yml b/.sync.yml index c70b890f5..e6e74ada7 100644 --- a/.sync.yml +++ b/.sync.yml @@ -3,6 +3,7 @@ secure: "SDpX6jzritODonEQBqy9g0NbOmk2a9dBfAtZLrvHwM8BTpM2W0Y1daqzIbpzxFiqlNX+6r2GSq9SV70N0A9Ko/uPV9aG/XZx7MsBR9DNVjgqjJSl7+aF88VJfRpOv4PAyTM33JMx91nLFxM/ql61YX+2DXGXrhUkBsMZcdBgQnk=" docker_sets: - set: docker/ubuntu-14.04 + - set: docker/ubuntu-16.04 - set: docker/centos-7 spec/spec_helper.rb: mock_with: ':rspec' diff --git a/.travis.yml b/.travis.yml index 10c5bcf3e..8a1ed90ab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,6 +31,12 @@ matrix: env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/ubuntu-14.04 CHECK=beaker services: docker sudo: required + - rvm: 2.4.3 + bundler_args: --without development release + dist: trusty + env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/ubuntu-16.04 CHECK=beaker + services: docker + sudo: required - rvm: 2.4.3 bundler_args: --without development release dist: trusty From 6a977fcdd16fe5bc3a8e73ccf223034d2cf5e269 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Sat, 3 Mar 2018 12:08:35 +0100 Subject: [PATCH 3/3] add debian8 acceptance tests --- .sync.yml | 1 + .travis.yml | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/.sync.yml b/.sync.yml index e6e74ada7..498e14173 100644 --- a/.sync.yml +++ b/.sync.yml @@ -5,5 +5,6 @@ - set: docker/ubuntu-14.04 - set: docker/ubuntu-16.04 - set: docker/centos-7 + - set: docker/debian-8 spec/spec_helper.rb: mock_with: ':rspec' diff --git a/.travis.yml b/.travis.yml index 8a1ed90ab..9628fe125 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,6 +43,12 @@ matrix: env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/centos-7 CHECK=beaker services: docker sudo: required + - rvm: 2.4.3 + bundler_args: --without development release + dist: trusty + env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/debian-8 CHECK=beaker + services: docker + sudo: required branches: only: - master