From 7dde02cd821a9374908e0d48802a0a666681b6a4 Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.co.uk>
Date: Wed, 20 May 2020 11:52:06 +0100
Subject: [PATCH] (IAC-746) - Add ubuntu 20.04 support

---
 .github/workflows/release.yml | 25 ++++++++++++++++++++++---
 .github/workflows/weekly.yml  | 25 ++++++++++++++++++++++---
 metadata.json                 |  3 ++-
 provision.yaml                |  7 +++++--
 4 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 03746c05..66e74ec3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -6,7 +6,7 @@ on:
       - 'release'
 
 jobs:
-  LitmusAcceptance:
+  LitmusAcceptancePuppet5:
     env:
       HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
       HONEYCOMB_DATASET: litmus tests
@@ -15,8 +15,27 @@ jobs:
       matrix:
         ruby_version: [2.5.x]
         puppet_gem_version: [~> 6.0]
-        platform: [release_checks]
-        agent_family: ['puppet5', 'puppet6']
+        platform: [release_checks_5]
+        agent_family: ['puppet5']
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Litmus Parallel
+      uses: puppetlabs/action-litmus_parallel@master
+      with:
+        platform: ${{ matrix.platform }}
+        agent_family: ${{ matrix.agent_family }}
+  LitmusAcceptancePuppet6:
+    env:
+      HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
+      HONEYCOMB_DATASET: litmus tests
+    runs-on: self-hosted
+    strategy:
+      matrix:
+        ruby_version: [2.5.x]
+        puppet_gem_version: [~> 6.0]
+        platform: [release_checks_6]
+        agent_family: ['puppet6']
 
     steps:
     - uses: actions/checkout@v1
diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml
index 28d905ce..5d621f45 100644
--- a/.github/workflows/weekly.yml
+++ b/.github/workflows/weekly.yml
@@ -5,7 +5,7 @@ on:
     - cron: '0 0 * * 6'
 
 jobs:
-  LitmusAcceptance:
+  LitmusAcceptancePuppet5:
     env:
       HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
       HONEYCOMB_DATASET: litmus tests
@@ -14,8 +14,27 @@ jobs:
       matrix:
         ruby_version: [2.5.x]
         puppet_gem_version: [~> 6.0]
-        platform: [release_checks]
-        agent_family: ['puppet5', 'puppet6']
+        platform: [release_checks_5]
+        agent_family: ['puppet5']
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Litmus Parallel
+      uses: puppetlabs/action-litmus_parallel@master
+      with:
+        platform: ${{ matrix.platform }}
+        agent_family: ${{ matrix.agent_family }}
+  LitmusAcceptancePuppet6:
+    env:
+      HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
+      HONEYCOMB_DATASET: litmus tests
+    runs-on: self-hosted
+    strategy:
+      matrix:
+        ruby_version: [2.5.x]
+        puppet_gem_version: [~> 6.0]
+        platform: [release_checks_6]
+        agent_family: ['puppet6']
 
     steps:
     - uses: actions/checkout@v1
diff --git a/metadata.json b/metadata.json
index 68ec5c4b..f49282e7 100644
--- a/metadata.json
+++ b/metadata.json
@@ -47,7 +47,8 @@
       "operatingsystemrelease": [
         "14.04",
         "16.04",
-        "18.04"
+        "18.04",
+        "20.04"
       ]
     },
     {
diff --git a/provision.yaml b/provision.yaml
index 71417a3a..4eca660d 100644
--- a/provision.yaml
+++ b/provision.yaml
@@ -11,6 +11,9 @@
   win:
     provisioner: vagrant
     images: ['gusztavvargadr/windows-server']
-  release_checks:
+  release_checks_5:
     provisioner: abs
-    images: ['redhat-7-x86_64','centos-7-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64', 'debian-9-x86_64', 'debian-10-x86_64', 'win-2016-x86_64', 'win-2019-x86_64']
+    images: ['redhat-7-x86_64','centos-7-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64',  'debian-9-x86_64', 'debian-10-x86_64', 'win-2016-x86_64', 'win-2019-x86_64']
+  release_checks_6:
+    provisioner: abs
+    images: ['redhat-7-x86_64','centos-7-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64',  'ubuntu-2004-x86_64', 'debian-9-x86_64', 'debian-10-x86_64', 'win-2016-x86_64', 'win-2019-x86_64']