From 3421fc8b7a91610caa7f5544ecb4de8d0ccb42fc Mon Sep 17 00:00:00 2001
From: Itxaka <itxaka.garcia@spectrocloud.com>
Date: Fri, 2 Feb 2024 16:00:50 +0100
Subject: [PATCH] Bump framework and osbuilder (#2201)

---
 .../reusable-upgrade-latest-test.yaml         |  2 +-
 Earthfile                                     | 28 +++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/reusable-upgrade-latest-test.yaml b/.github/workflows/reusable-upgrade-latest-test.yaml
index 6addf5686..6f7f9b3bd 100644
--- a/.github/workflows/reusable-upgrade-latest-test.yaml
+++ b/.github/workflows/reusable-upgrade-latest-test.yaml
@@ -18,7 +18,7 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: kvm
     env:
       MATCHER: ${{ inputs.release_matcher || inputs.flavor_release }}
     steps:
diff --git a/Earthfile b/Earthfile
index a8a84df74..f74210c8d 100644
--- a/Earthfile
+++ b/Earthfile
@@ -9,7 +9,7 @@ ARG LUET_VERSION=0.35.0
 # renovate: datasource=docker depName=aquasec/trivy
 ARG TRIVY_VERSION=0.48.3
 # renovate: datasource=github-releases depName=kairos-io/kairos-framework
-ARG KAIROS_FRAMEWORK_VERSION="v2.6.5"
+ARG KAIROS_FRAMEWORK_VERSION="v2.7.1"
 ARG COSIGN_SKIP=".*quay.io/kairos/.*"
 # TODO: rename ISO_NAME to something like ARTIFACT_NAME because there are place where we use ISO_NAME to refer to the artifact name
 
@@ -21,7 +21,7 @@ END
 ARG COSIGN_EXPERIMENTAL=0
 ARG CGO_ENABLED=0
 # renovate: datasource=docker depName=quay.io/kairos/osbuilder-tools versioning=semver-coerced
-ARG OSBUILDER_VERSION=v0.11.1
+ARG OSBUILDER_VERSION=v0.12.0
 ARG OSBUILDER_IMAGE=quay.io/kairos/osbuilder-tools:$OSBUILDER_VERSION
 ARG GOLINT_VERSION=1.52.2
 # renovate: datasource=docker depName=golang
@@ -33,7 +33,7 @@ ARG RENOVATE_VERSION=37
 # renovate: datasource=docker depName=koalaman/shellcheck-alpine versioning=docker
 ARG SHELLCHECK_VERSION=v0.9.0
 # renovate: datasource=docker depName=quay.io/kairos/enki versioning=docker
-ARG ENKI_VERSION=v0.0.12
+ARG ENKI_VERSION=v0.0.14
 
 ARG IMAGE_REPOSITORY_ORG=quay.io/kairos
 
@@ -324,19 +324,19 @@ enki-image:
     SAVE ARTIFACT /enki enki
 
 uki-iso:
-        ARG --required BASE_IMAGE # BASE_IMAGE is existing kairos image which needs to be converted to uki
-        FROM $BASE_IMAGE
-        ARG ISO_NAME=$(cat /etc/os-release | grep 'KAIROS_ARTIFACT' | sed 's/KAIROS_ARTIFACT=\"//' | sed 's/\"//')
-        ARG ENKI_FLAGS
-
-        FROM +uki-dev-tools-image
+    ARG --required BASE_IMAGE # BASE_IMAGE is existing kairos image which needs to be converted to uki
+    FROM $BASE_IMAGE
+    ARG ISO_NAME=$(cat /etc/os-release | grep 'KAIROS_ARTIFACT' | sed 's/KAIROS_ARTIFACT=\"//' | sed 's/\"//')
+    ARG ENKI_FLAGS
 
-        COPY +enki-image/enki /usr/bin/enki
-        COPY ./tests/keys /keys
-        RUN echo $BASE_IMAGE > /IMAGE
+    FROM +uki-dev-tools-image
 
-        RUN --no-cache enki build-uki $(cat /IMAGE) -o /tmp/kairos.uki.iso -k /keys ${ENKI_FLAGS}
-        SAVE ARTIFACT /tmp/kairos.uki.iso kairos.uki.iso AS LOCAL build/$ISO_NAME.uki.iso
+    COPY +enki-image/enki /usr/bin/enki
+    COPY ./tests/keys /keys
+    RUN echo $BASE_IMAGE > /IMAGE
+    WORKDIR /build
+    RUN --no-cache enki build-uki $(cat /IMAGE) --output-dir /build/ -k /keys --output-type iso ${ENKI_FLAGS}
+    SAVE ARTIFACT /build/*.iso AS LOCAL build/
 
 # WARNING the following targets are just for development purposes, use them at your own risk