Skip to content

Switch GHA runners to Ubuntu 24.04 #2242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davidcassany merged 2 commits into from
Dec 13, 2024
Merged

Switch GHA runners to Ubuntu 24.04 #2242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d03cc7
Switch GHA runners to Ubuntu 24.04
davidcassany Dec 12, 2024
56722ea
Simplify podman calls in CI steup
davidcassany Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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:
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/build_and_test_x86.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cache-cleanup.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -39,7 +39,7 @@ jobs:
contents: read
needs:
- version
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Cleanup
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cli.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ permissions:

jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Checkout code
uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docs-publish.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
env:
HUGO_VERSION: 0.111.0
steps:
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/push-images.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
6 changes: 2 additions & 4 deletions scripts/run_registry.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,9 @@ function push {
# Ugly hack around podman to circumvent the need of adding insecure registries
# at /etc/docker/daemon.json when using the docker client
docker save "${img}" | podman load
tag=${img##*:}
imgID=$(podman images -n | grep "${tag}" | awk '{print $3}' | head -n1)
podman tag "${imgID}" "${reg_img}"
podman tag "${img}" "${reg_img}"
Copy link
Contributor Author

@davidcassany davidcassany Dec 13, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can be simplified thanks to podman v4 included in Ubuntu 24.04. On v3 podman load was not keeping the name of the loaded image and we had to discover the new one somehow. Podman v4 addresses this behavior and keeps the original name.

podman push --tls-verify=false "${reg_img}"
podman rmi -f "${imgID}"
podman rmi -f "${img}"
done
}

Expand Down
4 changes: 2 additions & 2 deletions scripts/run_vm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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} \
Copy link
Contributor Author

@davidcassany davidcassany Dec 13, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

kvm_arg arguments were included twice. See this is already present in the line above.

${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
}
Expand Down
Loading