From 97a764edd6c731f5008d61adf6f36480bd24d5ad Mon Sep 17 00:00:00 2001 From: Dimitris Karakasilis Date: Wed, 9 Oct 2024 16:53:32 +0300 Subject: [PATCH] Add systemd boot standard image to the build matrix to make it easier to build UKI artifacts from it Signed-off-by: Dimitris Karakasilis --- .github/flavors.json | 11 +++++++++++ .github/workflows/release-arm.yaml | 1 + .github/workflows/release.yaml | 1 + 3 files changed, 13 insertions(+) diff --git a/.github/flavors.json b/.github/flavors.json index 109cb6e3ea..d141642370 100644 --- a/.github/flavors.json +++ b/.github/flavors.json @@ -219,6 +219,17 @@ "arch": "arm64", "worker": "ARM64" }, + { + "family": "ubuntu", + "flavor": "ubuntu", + "flavorRelease": "24.04", + "variant": "standard", + "model": "generic", + "baseImage": "ubuntu:24.04", + "arch": "amd64", + "bootloader": "systemd-boot", + "worker": "self-hosted" + }, { "family": "ubuntu", "flavor": "ubuntu", diff --git a/.github/workflows/release-arm.yaml b/.github/workflows/release-arm.yaml index ccb7e3a0ed..e9701613a1 100644 --- a/.github/workflows/release-arm.yaml +++ b/.github/workflows/release-arm.yaml @@ -320,6 +320,7 @@ jobs: -FLAVOR_RELEASE=${{ matrix.flavorRelease }} \ -FAMILY=${{ matrix.family }} \ -BASE_IMAGE=${{ matrix.baseImage }} + -BOOTLOADER=${{ matrix.bootloader || "grub" }} - name: Convert all json files into a reports.tar.gz file run: | cd build diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 1d5d0cc0fc..c6b380984e 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -457,6 +457,7 @@ jobs: --MODEL=${{ matrix.model }} \ --K3S_VERSION=${{ matrix.k3s_version }} \ --BASE_IMAGE=${{ matrix.baseImage }} + --BOOTLOADER=${{ matrix.bootloader || "grub" }} sudo mv build release - name: Push to quay