From 31eb4829bff3083c10134a9865437c63f58049ad Mon Sep 17 00:00:00 2001 From: Dan Webb Date: Tue, 31 Aug 2021 21:33:50 +0100 Subject: [PATCH 1/4] Standardise the tested platforms (#77) Signed-off-by: Dan Webb --- .github/workflows/ci.yml | 15 ++++++------- CHANGELOG.md | 2 ++ README.md | 2 +- kitchen.dokken.yml | 48 ++++++++++++++++++++++------------------ kitchen.yml | 19 ++++++++-------- metadata.rb | 8 ++++--- 6 files changed, 50 insertions(+), 44 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a5bcd27..111e489 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,14 +40,13 @@ jobs: strategy: matrix: os: - - 'debian-8' - - 'debian-9' - - 'centos-7' - - 'ubuntu-1604' - - 'ubuntu-1804' - - 'opensuse-leap-15' - - 'amazonlinux-2' - + - amazonlinux-2 + - debian-9 + - debian-10 + - centos-7 + - centos-8 + - ubuntu-1804 + - ubuntu-2004 suite: - 'default' fail-fast: false diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b2104f..621671e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ This file is used to list changes made in each version of the Dnsmasq cookbooks. ## Unreleased +- Standardise the tested platforms + ## 1.0.2 - *2021-08-31* - Standardise files with files in sous-chefs/repo-management diff --git a/README.md b/README.md index 223c6cf..7c3d8a3 100644 --- a/README.md +++ b/README.md @@ -85,7 +85,7 @@ If you need manage your DNS hosts you may use the `dnsmasq` data bag `managed_ho ## Testing -Please refer to the [TESTING file](TESTING.md) to see instructions for testing this cookbook. It is currently tested on the following platforms: CentOS 5.9, CentOS 6.4, Debian 7.1, Ubuntu 10.04, 12.04 and 13.04. +Please refer to the [TESTING file](TESTING.md) to see instructions for testing this cookbook. ## Contributors diff --git a/kitchen.dokken.yml b/kitchen.dokken.yml index 2507e4f..994b506 100644 --- a/kitchen.dokken.yml +++ b/kitchen.dokken.yml @@ -2,24 +2,21 @@ driver: name: dokken privileged: true # because Docker and SystemD/Upstart - env: [CHEF_LICENSE=accept] transport: name: dokken provisioner: name: dokken - product_name: chef - product_version: <%= ENV['CHEF_VERSION'] || 'latest' %> - install_strategy: once + +verifier: + name: inspec platforms: - - name: debian-8 + - name: amazonlinux-2 driver: - image: dokken/debian-8 - pid_one_command: /bin/systemd - intermediate_instructions: - - RUN /usr/bin/apt-get update + image: dokken/amazonlinux-2 + pid_one_command: /usr/lib/systemd/systemd - name: debian-9 driver: @@ -28,22 +25,27 @@ platforms: intermediate_instructions: - RUN /usr/bin/apt-get update - - name: centos-6 + - name: debian-10 driver: - image: dokken/centos-6 - pid_one_command: /sbin/init + image: dokken/debian-10 + pid_one_command: /bin/systemd + intermediate_instructions: + - RUN /usr/bin/apt-get update - name: centos-7 driver: image: dokken/centos-7 pid_one_command: /usr/lib/systemd/systemd - - name: ubuntu-16.04 + - name: centos-8 driver: - image: dokken/ubuntu-16.04 - pid_one_command: /sbin/init - intermediate_instructions: - - RUN /usr/bin/apt-get update + image: dokken/centos-8 + pid_one_command: /usr/lib/systemd/systemd + + - name: fedora-latest + driver: + image: dokken/fedora-latest + pid_one_command: /usr/lib/systemd/systemd - name: ubuntu-18.04 driver: @@ -52,12 +54,14 @@ platforms: intermediate_instructions: - RUN /usr/bin/apt-get update - - name: opensuse-leap-15 + - name: ubuntu-20.04 driver: - image: dokken/opensuse-leap-15 + image: dokken/ubuntu-20.04 pid_one_command: /bin/systemd + intermediate_instructions: + - RUN /usr/bin/apt-get update - - name: amazonlinux-2 + - name: opensuse-leap-15 driver: - image: dokken/amazonlinux-2 - pid_one_command: /usr/lib/systemd/systemd + image: dokken/opensuse-leap-15 + pid_one_command: /bin/systemd diff --git a/kitchen.yml b/kitchen.yml index bb6dba9..0a83ec1 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -3,24 +3,23 @@ driver: name: vagrant provisioner: - name: chef_solo + name: chef_zero product_name: chef enforce_idempotency: true multiple_converge: 2 - solo_rb: - treat_deprecation_warnings_as_errors: true + deprecations_as_errors: true verifier: name: inspec platforms: - - name: centos-6 - - name: centos-7 - - name: debian-8 - - name: debian-9 - - name: ubuntu-16.04 - - name: ubuntu-18.04 - - name: amazonlinux-2 + - amazonlinux-2 + - debian-9 + - debian-10 + - centos-7 + - centos-8 + - ubuntu-1804 + - ubuntu-2004 suites: - name: default diff --git a/metadata.rb b/metadata.rb index 3e08c5e..d37e502 100644 --- a/metadata.rb +++ b/metadata.rb @@ -9,6 +9,8 @@ issues_url 'https://github.com/sous-chefs/dnsmasq/issues' version '1.0.2' -%w(ubuntu debian redhat centos oracle).each do |os| - supports os -end +supports 'ubuntu' +supports 'debian' +supports 'redhat' +supports 'centos' +supports 'oracle' From 8b0674d3b0b8a1877e750c0c318bee10fec4b90e Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Tue, 31 Aug 2021 21:33:52 +0100 Subject: [PATCH 2/4] Update changelog for 1.1.0 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 621671e..9e24a05 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ This file is used to list changes made in each version of the Dnsmasq cookbooks. -## Unreleased +## 1.1.0 - *2021-08-31* - Standardise the tested platforms From dfcd345d6e967c9975826ed5f24d81f0eab95dcc Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Tue, 31 Aug 2021 21:33:53 +0100 Subject: [PATCH 3/4] Update metadata for 1.1.0 --- metadata.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.rb b/metadata.rb index d37e502..37d6ea8 100644 --- a/metadata.rb +++ b/metadata.rb @@ -7,7 +7,7 @@ chef_version '>= 15.3' source_url 'https://github.com/sous-chefs/dnsmasq' issues_url 'https://github.com/sous-chefs/dnsmasq/issues' -version '1.0.2' +version '1.1.0' supports 'ubuntu' supports 'debian' From 1897bb4ce082867dc05ea99517439ab2d7611db9 Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Tue, 31 Aug 2021 21:33:55 +0100 Subject: [PATCH 4/4] Set Changelog to ## Unreleased --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e24a05..a5bdbe8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ This file is used to list changes made in each version of the Dnsmasq cookbooks. +## Unreleased + ## 1.1.0 - *2021-08-31* - Standardise the tested platforms