Skip to content

Commit 2ea861d

Browse files
committed
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]>
1 parent ecaac09 commit 2ea861d

File tree

8 files changed

+22
-22
lines changed

8 files changed

+22
-22
lines changed

.github/workflows/build.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
detect:
1414
permissions:
1515
contents: read
16-
runs-on: ubuntu-latest
16+
runs-on: ubuntu-24.04
1717
outputs:
1818
flavor: ${{ steps.set-matrix.outputs.flavor }}
1919
platform: ${{ steps.set-platform.outputs.platform }}
@@ -34,7 +34,7 @@ jobs:
3434
contents: read
3535
needs:
3636
- detect
37-
runs-on: ubuntu-latest
37+
runs-on: ubuntu-24.04
3838
env:
3939
PLATFORM: ${{ needs.detect.outputs.platform }}
4040
outputs:

.github/workflows/build_and_test_x86.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
build-os:
1919
permissions:
2020
contents: read
21-
runs-on: ubuntu-latest
21+
runs-on: ubuntu-24.04
2222
env:
2323
FLAVOR: ${{ inputs.flavor }}
2424
ARCH: x86_64
@@ -64,7 +64,7 @@ jobs:
6464
contents: read
6565
needs:
6666
- build-os
67-
runs-on: ubuntu-latest
67+
runs-on: ubuntu-24.04
6868
env:
6969
FLAVOR: ${{ inputs.flavor }}
7070
ARCH: x86_64
@@ -110,7 +110,7 @@ jobs:
110110
contents: read
111111
needs:
112112
- build-os
113-
runs-on: ubuntu-latest
113+
runs-on: ubuntu-24.04
114114
env:
115115
FLAVOR: ${{ inputs.flavor }}
116116
ARCH: x86_64
@@ -161,7 +161,7 @@ jobs:
161161
detect:
162162
permissions:
163163
contents: read
164-
runs-on: ubuntu-latest
164+
runs-on: ubuntu-24.04
165165
outputs:
166166
tests: ${{ steps.detect.outputs.tests }}
167167
steps:
@@ -181,7 +181,7 @@ jobs:
181181
needs:
182182
- build-disk
183183
- detect
184-
runs-on: ubuntu-latest
184+
runs-on: ubuntu-24.04
185185
env:
186186
FLAVOR: ${{ inputs.flavor }}
187187
ARCH: x86_64
@@ -220,13 +220,13 @@ jobs:
220220
- name: Enable KVM group perms
221221
run: |
222222
sudo apt-get update
223-
sudo apt-get install qemu qemu-utils ovmf qemu-system-x86
223+
sudo apt-get install qemu-utils ovmf qemu-system-x86
224224
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
225225
sudo udevadm control --reload-rules
226226
sudo udevadm trigger --name-match=kvm
227227
- name: Run ${{ matrix.test }}
228228
run: |
229-
make DISK=/tmp/elemental-${{ env.FLAVOR }}.${{ env.ARCH}}.qcow2 ELMNTL_TARGETARCH=${{ env.ARCH }} ELMNTL_FIRMWARE=/usr/share/OVMF/OVMF_CODE.fd ${{ matrix.test }}
229+
make DISK=/tmp/elemental-${{ env.FLAVOR }}.${{ env.ARCH}}.qcow2 ELMNTL_TARGETARCH=${{ env.ARCH }} ELMNTL_FIRMWARE=/usr/share/OVMF/OVMF_CODE_4M.fd ${{ matrix.test }}
230230
- name: Upload serial console for ${{ matrix.test }}
231231
uses: actions/upload-artifact@v4
232232
if: always()
@@ -254,7 +254,7 @@ jobs:
254254
needs:
255255
- build-iso
256256
- detect
257-
runs-on: ubuntu-latest
257+
runs-on: ubuntu-24.04
258258
env:
259259
FLAVOR: ${{ inputs.flavor }}
260260
ARCH: x86_64
@@ -282,13 +282,13 @@ jobs:
282282
- name: Enable KVM group perms
283283
run: |
284284
sudo apt-get update
285-
sudo apt-get install qemu qemu-utils ovmf qemu-system-x86
285+
sudo apt-get install qemu-utils ovmf qemu-system-x86
286286
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
287287
sudo udevadm control --reload-rules
288288
sudo udevadm trigger --name-match=kvm
289289
- name: Run installer test
290290
run: |
291-
make ISO=/tmp/elemental-${{ env.FLAVOR }}.${{ env.ARCH}}.iso ELMNTL_TARGETARCH=${{ env.ARCH }} ELMNTL_FIRMWARE=/usr/share/OVMF/OVMF_CODE.fd test-installer
291+
make ISO=/tmp/elemental-${{ env.FLAVOR }}.${{ env.ARCH}}.iso ELMNTL_TARGETARCH=${{ env.ARCH }} ELMNTL_FIRMWARE=/usr/share/OVMF/OVMF_CODE_4M.fd test-installer
292292
- name: Upload serial console for installer tests
293293
uses: actions/upload-artifact@v4
294294
if: always()

.github/workflows/cache-cleanup.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
version:
1919
permissions:
2020
contents: read
21-
runs-on: ubuntu-latest
21+
runs-on: ubuntu-24.04
2222
outputs:
2323
version: ${{ steps.version.outputs.version }}
2424
steps:
@@ -39,7 +39,7 @@ jobs:
3939
contents: read
4040
needs:
4141
- version
42-
runs-on: ubuntu-latest
42+
runs-on: ubuntu-24.04
4343
steps:
4444
- name: Cleanup
4545
run: |

.github/workflows/cli.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ permissions:
1010

1111
jobs:
1212
build:
13-
runs-on: ubuntu-latest
13+
runs-on: ubuntu-24.04
1414
steps:
1515
- name: Checkout code
1616
uses: actions/checkout@v4

.github/workflows/docs-publish.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99

1010
jobs:
1111
build:
12-
runs-on: ubuntu-latest
12+
runs-on: ubuntu-24.04
1313
env:
1414
HUGO_VERSION: 0.111.0
1515
steps:
@@ -51,7 +51,7 @@ jobs:
5151
environment:
5252
name: github-pages
5353
url: ${{ steps.deployment.outputs.page_url }}
54-
runs-on: ubuntu-latest
54+
runs-on: ubuntu-24.04
5555
needs: build
5656
if: github.ref == 'refs/heads/main' && github.event_name == 'push'
5757
steps:

.github/workflows/nightly.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
build-toolkit:
1111
permissions:
1212
packages: write
13-
runs-on: ubuntu-latest
13+
runs-on: ubuntu-24.04
1414
env:
1515
PLATFORM: x86_64
1616
TOOLKIT_REPO: ghcr.io/${{github.repository}}/elemental-cli

.github/workflows/push-images.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
build-toolkit:
1515
permissions:
1616
packages: write
17-
runs-on: ubuntu-latest
17+
runs-on: ubuntu-24.04
1818
env:
1919
TOOLKIT_REPO: ghcr.io/${{github.repository}}/elemental-cli
2020
REPO: ghcr.io/${{github.repository}}/elemental-${{ github.event.inputs.flavor }}

scripts/run_vm.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ function _abort {
2929

3030
function start {
3131
local base_disk=$1
32-
local usrnet_arg="-netdev user,id=user0,hostfwd=tcp:${ELMNTL_FWDIP}:${ELMNTL_FWDPORT}-:22 -device virtio-net-pci,romfile=,netdev=user0"
32+
local usrnet_arg="-netdev user,id=user0,ipv6=off,hostfwd=tcp:${ELMNTL_FWDIP}:${ELMNTL_FWDPORT}-:22 -device virtio-net-pci,romfile=,netdev=user0"
3333
local accel_arg
3434
local memory_arg="-m ${ELMNTL_MEMORY}"
3535
local firmware_arg="-drive if=pflash,format=raw,unit=0,readonly=on,file=${ELMNTL_FIRMWARE}"
@@ -74,11 +74,11 @@ function start {
7474

7575
if [ "${ELMNTL_DEBUG}" == "yes" ]; then
7676
qemu-system-${ELMNTL_TARGETARCH} ${kvm_arg} ${disk_arg} ${cdrom_arg} ${global_arg} ${firmware_arg} \
77-
${usrnet_arg} ${kvm_arg} ${memory_arg} ${graphics_arg} -serial stdio ${pidfile_arg} \
77+
${usrnet_arg} ${memory_arg} ${graphics_arg} -serial stdio ${pidfile_arg} \
7878
${display_arg} ${machine_arg} ${accel_arg} ${cpu_arg}
7979
else
8080
qemu-system-${ELMNTL_TARGETARCH} ${kvm_arg} ${disk_arg} ${cdrom_arg} ${global_arg} ${firmware_arg} \
81-
${usrnet_arg} ${kvm_arg} ${memory_arg} ${graphics_arg} ${serial_arg} ${pidfile_arg} \
81+
${usrnet_arg} ${memory_arg} ${graphics_arg} ${serial_arg} ${pidfile_arg} \
8282
${display_arg} ${machine_arg} ${accel_arg} ${cpu_arg} > ${ELMNTL_VMSTDOUT} 2>&1 &
8383
fi
8484
}

0 commit comments

Comments
 (0)