Update install test OS matrix (#9480)

* Remove old cgroupsv2 test
* Consolidate install test clauses into functions
* Unpin vagrant-k3s plugin version, run latest
* Add ubuntu-2204 as install test, remove ubuntu-focal
* Update nightly install matrix
* Move to Leap 15.5
* Consolidate vagrant box caching key to improve cache hits on all VM testing

Signed-off-by: Derek Nola <derek.nola@suse.com>

.github/workflows/cgroup.yaml

@@ -1,88 +0,0 @@
-name: Control Group
-on:
-  push:
-    paths-ignore:
-      - "**.md"
-      - "channel.yaml"
-      - "install.sh"
-      - "tests/**"
-      - "!tests/cgroup/**"
-      - ".github/**"
-      - "!.github/workflows/cgroup.yaml"
-  pull_request:
-    paths-ignore:
-      - "**.md"
-      - "channel.yaml"
-      - "install.sh"
-      - "tests/**"
-      - "!tests/cgroup/**"
-      - ".github/**"
-      - "!.github/workflows/cgroup.yaml"
-  workflow_dispatch: {}
-
-permissions:
-  contents: read
-  
-jobs:
-  build:
-    uses: ./.github/workflows/build-k3s.yaml
-  test:
-    name: "Conformance Test"
-    needs: build
-    # nested virtualization is only available on macOS hosts
-    runs-on: macos-12
-    timeout-minutes: 40
-    strategy:
-      fail-fast: false
-      matrix:
-        vm: [fedora]
-        mode: [unified]
-      max-parallel: 1
-    defaults:
-      run:
-        working-directory: tests/cgroup/${{ matrix.mode }}/${{ matrix.vm }}
-    steps:
-      - name: "Checkout"
-        uses: actions/checkout@v4
-        with: { fetch-depth: 1 }
-      - name: "Download Binary"
-        uses: actions/download-artifact@v3
-        with: { name: k3s, path: dist/artifacts/ }
-      - name: "Vagrant Cache"
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.vagrant.d/boxes
-            ~/.vagrant.d/gems
-          key: cgroup-${{ hashFiles(format('tests/cgroup/{0}/{1}/Vagrantfile', matrix.mode, matrix.vm)) }}
-        id: vagrant-cache
-        continue-on-error: true
-      - name: "Vagrant Plugin(s)"
-        run: vagrant plugin install vagrant-k3s vagrant-reload
-      - name: "Vagrant Up"
-        run: vagrant up
-      - name: "K3s Prepare"
-        run: vagrant provision --provision-with=k3s-prepare
-      - name: ⏬ "K3s Install"
-        run: vagrant provision --provision-with=k3s-install
-      - name: ⏩ "K3s Start"
-        run: vagrant provision --provision-with=k3s-start
-      - name: "K3s Ready" # wait for k3s to be ready
-        run: vagrant provision --provision-with=k3s-ready
-      - name: "K3s Status" # kubectl get node,all -A -o wide
-        run: vagrant provision --provision-with=k3s-status
-      - name: "Sonobuoy (--mode=quick)"
-        env: {TEST_RESULTS_PATH: rootfull}
-        run: vagrant provision --provision-with=k3s-sonobuoy
-      - name: "K3s Stop" # stop k3s rootfull
-        run: vagrant ssh -- sudo systemctl stop k3s-server
-      - name: "Vagrant Reload"
-        run: vagrant reload
-      - name: "[Rootless] Starting K3s"
-        run: vagrant ssh -- systemctl --user start k3s-rootless
-      - name: "[Rootless] K3s Ready"
-        env: {TEST_KUBECONFIG: /home/vagrant/.kube/k3s.yaml}
-        run: vagrant provision --provision-with=k3s-ready
-      # - name: "[Rootless] Sonobuoy (--mode=quick)"
-      #   env: {TEST_KUBECONFIG: /home/vagrant/.kube/k3s.yaml, TEST_RESULTS_PATH: rootless}
-      #   run: vagrant provision --provision-with=k3s-sonobuoy

.github/workflows/install.yaml

@@ -30,7 +30,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        vm: [centos-7, rocky-8, rocky-9, fedora, opensuse-leap, ubuntu-focal]
+        vm: [centos-7, rocky-8, rocky-9, fedora, opensuse-leap, ubuntu-2204]
       max-parallel: 2
     defaults:
       run:
@@ -47,7 +47,7 @@ jobs:
           path: |
             ~/.vagrant.d/boxes
             ~/.vagrant.d/gems
-          key: install-${{ hashFiles(format('tests/install/{0}/Vagrantfile', matrix.vm)) }}
+          key: vagrant-box-${{ matrix.vm }}
         id: vagrant-cache
         continue-on-error: true
       - name: "Vagrant Plugin(s)"
@@ -65,6 +65,9 @@ jobs:
           vagrant scp k3s /tmp/k3s
           vagrant ssh -c "sudo mv /tmp/k3s /usr/local/bin/k3s"
           vagrant provision --provision-with=k3s-upload
+      - name: Add binary to PATH
+        if: matrix.vm == 'centos-7' || matrix.vm == 'rocky-8' || matrix.vm == 'rocky-9' || matrix.vm == 'opensuse-leap'
+        run: vagrant provision --provision-with=add-bin-path
       - name: "⏩ Install K3s"
         run: |
           vagrant provision --provision-with=k3s-prepare

.github/workflows/nightly-install.yaml

@@ -15,13 +15,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        channel: [stable]
-        vm: [centos-7, rocky-8, fedora, opensuse-leap, ubuntu-focal]
-        include:
-          - {channel: latest, vm: rocky-8}
-          - {channel: latest, vm: ubuntu-focal}
-          - {channel: latest, vm: opensuse-leap}
-      max-parallel: 2
+        channel: [stable, latest]
+        vm: [rocky-8, fedora, opensuse-leap, ubuntu-2204]
+      max-parallel: 4
     defaults:
       run:
         working-directory: tests/install/${{ matrix.vm }}
@@ -37,7 +33,7 @@ jobs:
           path: |
             ~/.vagrant.d/boxes
             ~/.vagrant.d/gems
-          key: install-${{ matrix.vm }}-${{ hashFiles('tests/install/${{ matrix.vm }}/Vagrantfile') }}
+          key: vagrant-box-${{ matrix.vm }}
         id: vagrant-cache
         continue-on-error: true
       - name: "Vagrant Plugin(s)"

.github/workflows/snapshotter.yaml

@@ -56,7 +56,7 @@ jobs:
           path: |
             ~/.vagrant.d/boxes
             ~/.vagrant.d/gems
-          key: snapshotter-${{ hashFiles(format('tests/snapshotter/{0}/{1}/Vagrantfile', matrix.snapshotter, matrix.vm)) }}
+          key: vagrant-box-${{ matrix.vm }}
         id: vagrant-cache
         continue-on-error: true
       - name: "Vagrant Plugin(s)"