From 23a173aa7eb6f14e1cc86c15a599c29cede24393 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <pedro@algarvio.me>
Date: Thu, 4 Mar 2021 11:00:03 +0000
Subject: [PATCH] One version per platform

---
 .github/workflows/tests.yml |  3 +--
 .kitchen.yml                | 21 ++++++---------------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index bc91927..d3a86cd 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -11,8 +11,7 @@ jobs:
         os:
         - centos
         - debian
-        - ubuntu-16
-        - ubuntu-18
+        - ubuntu
     steps:
     - uses: actions/checkout@v2
 
diff --git a/.kitchen.yml b/.kitchen.yml
index 1ea777a..9867364 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -86,20 +86,11 @@ platforms:
         sudo apt-get update
         DEBIAN_FRONTEND=noninteractive sudo apt-get install -y software-properties-common
       salt_bootstrap_options: -X -x python3 -p git -p curl -p sudo -p software-properties-common stable 3000.6
-  - name: ubuntu-16.04
+  - name: debian-10
     provisioner:
-      salt_apt_repo: 'https://repo.saltproject.io/py3/ubuntu/16.04/amd64/archive'
-      salt_apt_repo_key: 'https://repo.saltproject.io/py3/ubuntu/16.04/amd64/latest/SALTSTACK-GPG-KEY.pub'
-      init_environment: |
-        sudo mkdir -p /tmp/kitchen/var/cache/salt/master
-        sudo apt-get update
-        DEBIAN_FRONTEND=noninteractive sudo apt-get install -y software-properties-common
-      salt_bootstrap_options: -X -x python3 -p git -p curl -p sudo -p software-properties-common stable 3000.6
-  - name: debian-9
-    provisioner:
-      salt_apt_repo: 'https://repo.saltproject.io/py3/debian/9/amd64/archive'
-      salt_apt_repo_key: 'https://repo.saltproject.io/py3/debian/9/amd64/latest/SALTSTACK-GPG-KEY.pub'
-  - name: centos-7
+      salt_apt_repo: 'https://repo.saltproject.io/py3/debian/10/amd64/archive'
+      salt_apt_repo_key: 'https://repo.saltproject.io/py3/debian/10/amd64/latest/SALTSTACK-GPG-KEY.pub'
+  - name: centos-8
     driver_config:
       provision_command:
         - echo . /etc/profile >> ~kitchen/.bashrc
@@ -108,8 +99,8 @@ platforms:
         - yum install -y epel-release
         - yum install -y python3-pip python3-devel gcc git gcc-c++
     provisioner:
-      salt_yum_repo: 'https://repo.saltproject.io/py3/redhat/7/x86_64/archive/%s'
-      salt_yum_rpm_key: 'https://repo.saltproject.io/py3/redhat/7/x86_64/latest/SALTSTACK-GPG-KEY.pub'
+      salt_yum_repo: 'https://repo.saltproject.io/py3/redhat/8/x86_64/archive/%s'
+      salt_yum_rpm_key: 'https://repo.saltproject.io/py3/redhat/8/x86_64/latest/SALTSTACK-GPG-KEY.pub'
 <% if @vagrant != false %>
   - name: windows-2012r2
     driver: