From 021b9851bd4bba9a462c35929539a71460f66d3e Mon Sep 17 00:00:00 2001 From: Danny Bessems Date: Tue, 15 Sep 2026 13:27:24 +1000 Subject: [PATCH] feat: Upgrade to 26.04 LTS --- .gitea/workflows/actions.yaml | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/.gitea/workflows/actions.yaml b/.gitea/workflows/actions.yaml index 6c24700..ec86f44 100644 --- a/.gitea/workflows/actions.yaml +++ b/.gitea/workflows/actions.yaml @@ -1,6 +1,10 @@ name: build-image on: [push] +env: + UBUNTU_VERSION: '26.04' # Resolute + UBUNTU_SOURCE_IMAGE: https://st.itch.fyi/api/share/olYwWjZ17e?mode=download + jobs: semrel_dryrun: name: Semantic Release (Dry-run) @@ -59,11 +63,11 @@ jobs: - name: Retrieve source Ubuntu image run: | curl -L \ - https://sn.itch.fyi/Repository/iso/Canonical/Ubuntu%20Server%2024.04/ubuntu-24.04-server-cloudimg-amd64.img \ - -o ubuntu-vm/ubuntu-24.04-rke2-v${{ needs.semrel_dryrun.outputs.version }}.img \ + ${{ env.UBUNTU_SOURCE_IMAGE }} \ + -o ubuntu-vm/ubuntu-${{ env.UBUNTU_VERSION }}-rke2-v${{ needs.semrel_dryrun.outputs.version }}.img \ -u ${{ secrets.REPO_USERNAME }}:${{ secrets.REPO_PASSWORD }} - qemu-img resize ubuntu-vm/ubuntu-24.04-rke2-v${{ needs.semrel_dryrun.outputs.version }}.img +5G + qemu-img resize ubuntu-vm/ubuntu-${{ env.UBUNTU_VERSION }}-rke2-v${{ needs.semrel_dryrun.outputs.version }}.img +5G - name: Generate seed ISO run: | envsubst < cloud-init/user-data.template > cloud-init/user-data @@ -86,7 +90,7 @@ jobs: -m 3072 \ -smp 2 \ -cpu host \ - -drive file=ubuntu-vm/ubuntu-24.04-rke2-v${{ needs.semrel_dryrun.outputs.version }}.img,if=virtio,format=qcow2 \ + -drive file=ubuntu-vm/ubuntu-${{ env.UBUNTU_VERSION }}-rke2-v${{ needs.semrel_dryrun.outputs.version }}.img,if=virtio,format=qcow2 \ -drive file=ubuntu-vm/seed.iso,format=raw,media=cdrom \ -nographic \ -net nic \ @@ -95,15 +99,15 @@ jobs: -chardev socket,path=qga.sock,server=on,wait=off,id=qga0 \ -device virtserialport,chardev=qga0,name=org.qemu.guest_agent.0 - if ! guestfish --ro -a ubuntu-vm/ubuntu-24.04-rke2-v${{ needs.semrel_dryrun.outputs.version }}.img -i stat /var/log/template-generation-success; then + if ! guestfish --ro -a ubuntu-vm/ubuntu-${{ env.UBUNTU_VERSION }}-rke2-v${{ needs.semrel_dryrun.outputs.version }}.img -i stat /var/log/template-generation-success; then echo "VM provisioning encountered errors - exiting" exit 1 fi - name: Compress image file run: | virt-sparsify --compress \ - ubuntu-vm/ubuntu-24.04-rke2-v${{ needs.semrel_dryrun.outputs.version }}.img \ - ubuntu-vm/ubuntu-24.04-rke2-v${{ needs.semrel_dryrun.outputs.version }}-compacted.img + ubuntu-vm/ubuntu-${{ env.UBUNTU_VERSION }}-rke2-v${{ needs.semrel_dryrun.outputs.version }}.img \ + ubuntu-vm/ubuntu-${{ env.UBUNTU_VERSION }}-rke2-v${{ needs.semrel_dryrun.outputs.version }}-compacted.img - name: Upload image file run: | REPO_TOKEN=$(curl -fsSL -X POST \ @@ -112,9 +116,9 @@ jobs: -d '{"username": "admin", "password": "${{ secrets.REPO_PASSWORD }}"}' \ ) curl -fsSL -X POST \ - http://filebrowser.filebrowser.svc.cluster.local:80/api/resources/rel/ubuntu-24.04-rke2-v${{ needs.semrel_dryrun.outputs.version }}.img?override=true \ + http://filebrowser.filebrowser.svc.cluster.local:80/api/resources/rel/ubuntu-${{ env.UBUNTU_VERSION }}-rke2-v${{ needs.semrel_dryrun.outputs.version }}.img?override=true \ --header "X-Auth: $REPO_TOKEN" \ - --upload-file "ubuntu-vm/ubuntu-24.04-rke2-v${{ needs.semrel_dryrun.outputs.version }}-compacted.img" + --upload-file "ubuntu-vm/ubuntu-${{ env.UBUNTU_VERSION }}-rke2-v${{ needs.semrel_dryrun.outputs.version }}-compacted.img" curl -ksS -X PUT "https://lab-hv-vip.bessems.lan/v1/harvesterhci.io.virtualmachineimages" \ -H "Authorization: Bearer ${{ secrets.HV_TOKEN }}" \ @@ -126,9 +130,9 @@ jobs: "namespace": "default" }, "spec": { - "displayName": "ubuntu-24.04-rke2-v${{ needs.semrel_dryrun.outputs.version }}", + "displayName": "ubuntu-${{ env.UBUNTU_VERSION }}-rke2-v${{ needs.semrel_dryrun.outputs.version }}", "sourceType": "download", - "url": "https://${{ secrets.REPO_USERNAME }}:${{ secrets.REPO_PASSWORD }}@sn.itch.fyi/Repository/rel/ubuntu-24.04-rke2-v${{ needs.semrel_dryrun.outputs.version }}.img" + "url": "https://${{ secrets.REPO_USERNAME }}:${{ secrets.REPO_PASSWORD }}@sn.itch.fyi/Repository/rel/ubuntu-${{ env.UBUNTU_VERSION }}-rke2-v${{ needs.semrel_dryrun.outputs.version }}.img" } } EOF