Merge branch 'main' into fix_hosts_file_entry

.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

CHANGELOG.md

@@ -6,6 +6,10 @@ This file is used to list changes made in each version of the Dnsmasq cookbooks.
 
 - Fix resource name typo and added dependency cookbook for hostsfile_entry (hostsfile)
 
+## 1.1.0 - *2021-08-31*
+
+- Standardise the tested platforms
+
 ## 1.0.2 - *2021-08-31*
 
 - Standardise files with files in sous-chefs/repo-management

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
 

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

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

metadata.rb

@@ -7,10 +7,13 @@
 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'
-
-%w(ubuntu debian redhat centos oracle).each do |os|
-  supports os
-end
+version           '1.1.0'
 
 depends 'hostsfile'
+
+supports 'ubuntu'
+supports 'debian'
+supports 'redhat'
+supports 'centos'
+supports 'oracle'
+