From 7996c141795c64a6176c33f61c09996f3e9a7565 Mon Sep 17 00:00:00 2001
From: "Benjamin M. Hughes" <bmhughes@bmhughes.co.uk>
Date: Fri, 28 May 2021 13:19:08 +0100
Subject: [PATCH] Update CI platforms

---
 .github/workflows/ci.yml |  1 +
 kitchen.dokken.yml       | 10 +++++++---
 kitchen.yml              |  9 +++++++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 65dbe22..2cb33ee 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -34,6 +34,7 @@ jobs:
           - 'fedora-latest'
           - 'ubuntu-1604'
           - 'ubuntu-1804'
+          - 'ubuntu-2004'
 
         suite:
           - 'all-tables'
diff --git a/kitchen.dokken.yml b/kitchen.dokken.yml
index 9b229e7..4fbe23f 100644
--- a/kitchen.dokken.yml
+++ b/kitchen.dokken.yml
@@ -3,15 +3,12 @@ driver:
   name: dokken
   privileged: true
   chef_version: <%= ENV['CHEF_VERSION'] || 'current' %>
-  chef_license: accept-no-persist
 
 transport:
   name: dokken
 
 provisioner:
   name: dokken
-  # We have our own deprecation errors ...
-  deprecations_as_errors: false
 
 platforms:
   - name: amazonlinux-2
@@ -71,3 +68,10 @@ platforms:
       pid_one_command: /bin/systemd
       intermediate_instructions:
         - RUN /usr/bin/apt-get update
+
+  - name: ubuntu-20.04
+    driver:
+      image: dokken/ubuntu-20.04
+      pid_one_command: /bin/systemd
+      intermediate_instructions:
+        - RUN /usr/bin/apt-get update
diff --git a/kitchen.yml b/kitchen.yml
index 45134eb..957ffbc 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -4,8 +4,12 @@ driver:
 
 provisioner:
   name: chef_zero
-  deprecations_as_errors: false
-  chef_license: accept-no-persist
+  deprecations_as_errors: true
+  chef_license: accept
+  product_name: chef
+  product_version: <%= ENV['CHEF_VERSION'] || 'latest' %>
+  install_strategy: always
+  log_level: <%= ENV['CHEF_LOG_LEVEL'] || 'auto' %>
 
 verifier:
   name: inspec
@@ -23,6 +27,7 @@ platforms:
   - name: fedora-latest
   - name: ubuntu-16.04
   - name: ubuntu-18.04
+  - name: ubuntu-20.04
 
 suites:
   - name: all-tables