Switch GHA runners to Ubuntu 24.04

Ubuntu 24.04 is about to the version deployed with ubuntu-latest. This commit is to start using it and validating it before the actual change happens. Signed-off-by: David Cassany <[email protected]>
rancher · Dec 13, 2024 · 0d03cc7 · 0d03cc7
1 parent ecaac09
commit 0d03cc7
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 21 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -13,7 +13,7 @@ jobs:
   detect:
     permissions:
       contents: read
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     outputs:
       flavor: ${{ steps.set-matrix.outputs.flavor }}
       platform: ${{ steps.set-platform.outputs.platform }}
@@ -34,7 +34,7 @@ jobs:
       contents: read
     needs:
       - detect
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     env:
       PLATFORM: ${{ needs.detect.outputs.platform }}
     outputs:

diff --git a/.github/workflows/build_and_test_x86.yaml b/.github/workflows/build_and_test_x86.yaml
@@ -18,7 +18,7 @@ jobs:
   build-os:
     permissions:
       contents: read
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     env:
       FLAVOR: ${{ inputs.flavor }}
       ARCH: x86_64
@@ -64,7 +64,7 @@ jobs:
       contents: read
     needs: 
       - build-os
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     env:
       FLAVOR: ${{ inputs.flavor }}
       ARCH: x86_64
@@ -110,7 +110,7 @@ jobs:
       contents: read
     needs:
       - build-os
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     env:
       FLAVOR: ${{ inputs.flavor }}
       ARCH: x86_64
@@ -161,7 +161,7 @@ jobs:
   detect:
     permissions:
       contents: read
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     outputs:
       tests: ${{ steps.detect.outputs.tests }}
     steps:
@@ -181,7 +181,7 @@ jobs:
     needs:
       - build-disk
       - detect
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     env:
       FLAVOR: ${{ inputs.flavor }}
       ARCH: x86_64
@@ -220,13 +220,13 @@ jobs:
       - name: Enable KVM group perms
         run: |
           sudo apt-get update
-          sudo apt-get install qemu qemu-utils ovmf qemu-system-x86
+          sudo apt-get install qemu-utils ovmf qemu-system-x86
           echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
           sudo udevadm control --reload-rules
           sudo udevadm trigger --name-match=kvm
       - name: Run ${{ matrix.test }}
         run: |
-          make DISK=/tmp/elemental-${{ env.FLAVOR }}.${{ env.ARCH}}.qcow2 ELMNTL_TARGETARCH=${{ env.ARCH }} ELMNTL_FIRMWARE=/usr/share/OVMF/OVMF_CODE.fd ${{ matrix.test }}
+          make DISK=/tmp/elemental-${{ env.FLAVOR }}.${{ env.ARCH}}.qcow2 ELMNTL_TARGETARCH=${{ env.ARCH }} ELMNTL_FIRMWARE=/usr/share/OVMF/OVMF_CODE_4M.fd ${{ matrix.test }}
       - name: Upload serial console for ${{ matrix.test }}
         uses: actions/upload-artifact@v4
         if: always()
@@ -254,7 +254,7 @@ jobs:
     needs:
       - build-iso
       - detect
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     env:
       FLAVOR: ${{ inputs.flavor }}
       ARCH: x86_64
@@ -282,13 +282,13 @@ jobs:
       - name: Enable KVM group perms
         run: |
           sudo apt-get update
-          sudo apt-get install qemu qemu-utils ovmf qemu-system-x86
+          sudo apt-get install qemu-utils ovmf qemu-system-x86
           echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
           sudo udevadm control --reload-rules
           sudo udevadm trigger --name-match=kvm
       - name: Run installer test
         run: |
-          make ISO=/tmp/elemental-${{ env.FLAVOR }}.${{ env.ARCH}}.iso ELMNTL_TARGETARCH=${{ env.ARCH }} ELMNTL_FIRMWARE=/usr/share/OVMF/OVMF_CODE.fd test-installer
+          make ISO=/tmp/elemental-${{ env.FLAVOR }}.${{ env.ARCH}}.iso ELMNTL_TARGETARCH=${{ env.ARCH }} ELMNTL_FIRMWARE=/usr/share/OVMF/OVMF_CODE_4M.fd test-installer
       - name: Upload serial console for installer tests
         uses: actions/upload-artifact@v4
         if: always()

diff --git a/.github/workflows/cache-cleanup.yaml b/.github/workflows/cache-cleanup.yaml
@@ -18,7 +18,7 @@ jobs:
   version:
     permissions:
       contents: read
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     outputs:
       version: ${{ steps.version.outputs.version }}
     steps:
@@ -39,7 +39,7 @@ jobs:
       contents: read
     needs:
       - version
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Cleanup
         run: |

diff --git a/.github/workflows/cli.yaml b/.github/workflows/cli.yaml
@@ -10,7 +10,7 @@ permissions:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

diff --git a/.github/workflows/docs-publish.yaml b/.github/workflows/docs-publish.yaml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     env:
       HUGO_VERSION: 0.111.0
     steps:
@@ -51,7 +51,7 @@ jobs:
     environment:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: build
     if: github.ref == 'refs/heads/main' && github.event_name == 'push'
     steps:

diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml
@@ -10,7 +10,7 @@ jobs:
   build-toolkit:
     permissions:
       packages: write
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     env:
       PLATFORM: x86_64
       TOOLKIT_REPO: ghcr.io/${{github.repository}}/elemental-cli 

diff --git a/.github/workflows/push-images.yaml b/.github/workflows/push-images.yaml
@@ -14,7 +14,7 @@ jobs:
   build-toolkit:
     permissions:
       packages: write
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     env:
       TOOLKIT_REPO: ghcr.io/${{github.repository}}/elemental-cli 
       REPO: ghcr.io/${{github.repository}}/elemental-${{ github.event.inputs.flavor }} 

diff --git a/scripts/run_vm.sh b/scripts/run_vm.sh
@@ -74,11 +74,11 @@ function start {
 
   if [ "${ELMNTL_DEBUG}" == "yes" ]; then
       qemu-system-${ELMNTL_TARGETARCH} ${kvm_arg} ${disk_arg} ${cdrom_arg} ${global_arg} ${firmware_arg} \
-          ${usrnet_arg} ${kvm_arg} ${memory_arg} ${graphics_arg} -serial stdio ${pidfile_arg} \
+          ${usrnet_arg} ${memory_arg} ${graphics_arg} -serial stdio ${pidfile_arg} \
           ${display_arg} ${machine_arg} ${accel_arg} ${cpu_arg}
   else 
       qemu-system-${ELMNTL_TARGETARCH} ${kvm_arg} ${disk_arg} ${cdrom_arg} ${global_arg} ${firmware_arg} \
-          ${usrnet_arg} ${kvm_arg} ${memory_arg} ${graphics_arg} ${serial_arg} ${pidfile_arg} \
+          ${usrnet_arg} ${memory_arg} ${graphics_arg} ${serial_arg} ${pidfile_arg} \
           ${display_arg} ${machine_arg} ${accel_arg} ${cpu_arg} > ${ELMNTL_VMSTDOUT} 2>&1 &
   fi
 }