From afc2595637038cc3b03dda0fb0a7c306b456e847 Mon Sep 17 00:00:00 2001 From: Dennis Hoppe Date: Mon, 27 Apr 2020 14:20:42 +0200 Subject: [PATCH 1/2] Add support for Debian 9/10, Ubuntu 18.04 --- .sync.yml | 9 ++++++++ .travis.yml | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++ metadata.json | 26 +++++++++++++-------- 3 files changed, 89 insertions(+), 10 deletions(-) diff --git a/.sync.yml b/.sync.yml index a5b9701..bd2b6cb 100644 --- a/.sync.yml +++ b/.sync.yml @@ -6,4 +6,13 @@ Gemfile: spec/spec_helper.rb: hiera_config: "'spec/hiera.yaml'" .travis.yml: + docker_sets: + - set: centos6-64 + - set: centos7-64 + - set: centos8-64 + - set: debian8-64 + - set: debian9-64 + - set: debian10-64 + - set: ubuntu1604-64 + - set: ubuntu1804-64 secure: "LUBdRnwDBx3H9ZfmPK2Lj7C4jGNh91mG3qwEmpq0sIz3xzmmcbUz/LS0efVxId/A5TDn34NcHCB4qrs4Kq0Ayf6lonIvFUMy7xsErLP/qTR4rdjR0f/mzeAjyf+uyh9/od7qRfMC5Bu4zuqLacA45g0CdkfYhuwLsI0fWrml6oSydloeOO38G3LxdSzu+WRR4Qi1qJ6uUYygiDpWh6Fhx88Brmhzpi0i9zz2wOpXccgP88tO6u1zXRTt9ypnlrQRIBg8IMmNkHB+cSb06yUgOQQLTM69/6C+rlSVAPtBwpa40iaOGDF9yn3Sl2G6Qwo1T/HEGPaW0DfPfyP0zNlsnc2lbcsWwpPr7yKmAPEgbH/7WKISn7BZn45yDLKxtBfqcWSIRoFqIEhfsdKzKvZKQVW1NYiUSLCbZ6ipxE7t0YnFqDV1W+AmWFFK+dDkFgYY9L/XD2xuDOepO3iG0P7im8/LJxvqIiyzOhV+M2a5rC9Ux51maChYV/o5YYx4Jou3MS9sJGfPxMhfNs0ZPLv10klwDAhQy/NAztR/MQGgjxbVPG1QZBupRuTCswGFZ0EKMeEH2hrTpgrcjtporoVIBBKZPHGY2lbqF+xeuQjDLcJynsx8bWNgizXrhU5hBMUh/AjPG4qvS9DoLbbpSd6PTwrG4QZkWOPORI47ojiTCUQ=" diff --git a/.travis.yml b/.travis.yml index 712988f..8ea277b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,6 +22,70 @@ matrix: - rvm: 2.4.4 bundler_args: --without system_tests development release env: PUPPET_VERSION="~> 5.0" CHECK=build DEPLOY_TO_FORGE=yes + - rvm: 2.5.3 + bundler_args: --without development release + env: BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_setfile=centos6-64 CHECK=beaker + services: docker + - rvm: 2.5.3 + bundler_args: --without development release + env: BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=centos6-64 CHECK=beaker + services: docker + - rvm: 2.5.3 + bundler_args: --without development release + env: BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_setfile=centos7-64 CHECK=beaker + services: docker + - rvm: 2.5.3 + bundler_args: --without development release + env: BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=centos7-64 CHECK=beaker + services: docker + - rvm: 2.5.3 + bundler_args: --without development release + env: BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_setfile=centos8-64 CHECK=beaker + services: docker + - rvm: 2.5.3 + bundler_args: --without development release + env: BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=centos8-64 CHECK=beaker + services: docker + - rvm: 2.5.3 + bundler_args: --without development release + env: BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_setfile=debian8-64 CHECK=beaker + services: docker + - rvm: 2.5.3 + bundler_args: --without development release + env: BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=debian8-64 CHECK=beaker + services: docker + - rvm: 2.5.3 + bundler_args: --without development release + env: BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_setfile=debian9-64 CHECK=beaker + services: docker + - rvm: 2.5.3 + bundler_args: --without development release + env: BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=debian9-64 CHECK=beaker + services: docker + - rvm: 2.5.3 + bundler_args: --without development release + env: BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_setfile=debian10-64 CHECK=beaker + services: docker + - rvm: 2.5.3 + bundler_args: --without development release + env: BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=debian10-64 CHECK=beaker + services: docker + - rvm: 2.5.3 + bundler_args: --without development release + env: BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_setfile=ubuntu1604-64 CHECK=beaker + services: docker + - rvm: 2.5.3 + bundler_args: --without development release + env: BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=ubuntu1604-64 CHECK=beaker + services: docker + - rvm: 2.5.3 + bundler_args: --without development release + env: BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_setfile=ubuntu1804-64 CHECK=beaker + services: docker + - rvm: 2.5.3 + bundler_args: --without development release + env: BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=ubuntu1804-64 CHECK=beaker + services: docker branches: only: - master diff --git a/metadata.json b/metadata.json index dc5864e..1cf8c8f 100644 --- a/metadata.json +++ b/metadata.json @@ -14,14 +14,18 @@ ], "operatingsystem_support": [ { - "operatingsystem": "Ubuntu", + "operatingsystem": "RedHat", "operatingsystemrelease": [ - "16.04" + "6", + "7", + "8" ] }, { - "operatingsystem": "Debian", + "operatingsystem": "CentOS", "operatingsystemrelease": [ + "6", + "7", "8" ] }, @@ -29,21 +33,23 @@ "operatingsystem": "OracleLinux", "operatingsystemrelease": [ "6", - "7" + "7", + "8" ] }, { - "operatingsystem": "CentOS", + "operatingsystem": "Debian", "operatingsystemrelease": [ - "6", - "7" + "8", + "9", + "10" ] }, { - "operatingsystem": "RedHat", + "operatingsystem": "Ubuntu", "operatingsystemrelease": [ - "6", - "7" + "16.04", + "18.04" ] }, { From ac16f3d6df12ec5eed3cee347841bc1c0f23cff7 Mon Sep 17 00:00:00 2001 From: Dennis Hoppe Date: Mon, 27 Apr 2020 17:08:38 +0200 Subject: [PATCH 2/2] Do not pin facterdb to version 3.6 --- spec/classes/telegraf_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/classes/telegraf_spec.rb b/spec/classes/telegraf_spec.rb index 7d0165f..ba136b2 100644 --- a/spec/classes/telegraf_spec.rb +++ b/spec/classes/telegraf_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe 'telegraf' do - on_supported_os(facterversion: '3.6').each do |os, facts| + on_supported_os.each do |os, facts| context "on #{os}" do let(:facts) do facts