From 71eacd22aabd235bc4b069626d574ccd6533605f Mon Sep 17 00:00:00 2001
From: Derek Nola <derek.nola@suse.com>
Date: Mon, 21 Nov 2022 12:58:50 -0800
Subject: [PATCH] Github CI Updates (#6522)

* Bump unit tests OS
* Bump action cache version to v3
* Rework cache naming scheme

Signed-off-by: Derek Nola <derek.nola@suse.com>
---
 .github/workflows/cgroup.yaml          | 2 +-
 .github/workflows/install.yaml         | 2 +-
 .github/workflows/nightly-install.yaml | 4 ++--
 .github/workflows/snapshotter.yaml     | 2 +-
 .github/workflows/unitcoverage.yaml    | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/cgroup.yaml b/.github/workflows/cgroup.yaml
index 13270ec2ad6..8d25a7bb8c7 100644
--- a/.github/workflows/cgroup.yaml
+++ b/.github/workflows/cgroup.yaml
@@ -56,7 +56,7 @@ jobs:
         uses: actions/download-artifact@v2
         with: { name: k3s, path: dist/artifacts/ }
       - name: "Vagrant Cache"
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             ~/.vagrant.d/boxes
diff --git a/.github/workflows/install.yaml b/.github/workflows/install.yaml
index f2b10232a6f..e6120cd0b85 100644
--- a/.github/workflows/install.yaml
+++ b/.github/workflows/install.yaml
@@ -49,7 +49,7 @@ jobs:
         uses: actions/checkout@v2
         with: {fetch-depth: 1}
       - name: "Vagrant Cache"
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             ~/.vagrant.d/boxes
diff --git a/.github/workflows/nightly-install.yaml b/.github/workflows/nightly-install.yaml
index a67f7265a99..15e03232829 100644
--- a/.github/workflows/nightly-install.yaml
+++ b/.github/workflows/nightly-install.yaml
@@ -28,12 +28,12 @@ jobs:
         uses: actions/checkout@v2
         with: {fetch-depth: 1}
       - name: "Vagrant Cache"
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             ~/.vagrant.d/boxes
             ~/.vagrant.d/gems
-          key: install-${{ hashFiles(format('tests/install/{0}/Vagrantfile', matrix.vm)) }}
+          key: install-${{ matrix.vm }}-${{ hashFiles('tests/install/${{ matrix.vm }}/Vagrantfile') }}
         id: vagrant-cache
         continue-on-error: true
       - name: "Vagrant Plugin(s)"
diff --git a/.github/workflows/snapshotter.yaml b/.github/workflows/snapshotter.yaml
index 09088673821..ac66b6d8a5e 100644
--- a/.github/workflows/snapshotter.yaml
+++ b/.github/workflows/snapshotter.yaml
@@ -58,7 +58,7 @@ jobs:
         uses: actions/download-artifact@v2
         with: { name: k3s, path: dist/artifacts/ }
       - name: "Vagrant Cache"
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             ~/.vagrant.d/boxes
diff --git a/.github/workflows/unitcoverage.yaml b/.github/workflows/unitcoverage.yaml
index f11dd0a6389..8cd14c47fd1 100644
--- a/.github/workflows/unitcoverage.yaml
+++ b/.github/workflows/unitcoverage.yaml
@@ -27,7 +27,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-18.04, ubuntu-20.04]
+        os: [ubuntu-20.04, ubuntu-22.04]
     timeout-minutes: 20
     steps:
     - name: Checkout