From d9967f41a9776f82857c7f26e63d6d9dcfc46d2a Mon Sep 17 00:00:00 2001 From: Dimitris Karakasilis Date: Thu, 28 Nov 2024 11:25:38 +0200 Subject: [PATCH] Use auroraboot everywhere and position flags correctly because they are ignored if the come after positional arguments Signed-off-by: Dimitris Karakasilis --- .github/workflows/reusable-uki-test.yaml | 7 ++++--- Earthfile | 5 ++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/reusable-uki-test.yaml b/.github/workflows/reusable-uki-test.yaml index d1e9798d5..842953ddb 100644 --- a/.github/workflows/reusable-uki-test.yaml +++ b/.github/workflows/reusable-uki-test.yaml @@ -84,7 +84,7 @@ jobs: --BASE_IMAGE=$TEMP_IMAGE \ --AURORABOOT_OVERLAY_DIR=tests/assets/sysext/ \ --AURORABOOT_KEYS_DIR=tests/assets/keys/ \ - --AURORABOOT_FLAGS="--single-efi-cmdline \"testentry: nothing\"" + --AURORABOOT_FLAGS="--single-efi-cmdline=\"testentry: nothing\"" - name: Create datasource iso 🔧 run: | earthly +datasource-iso --CLOUD_CONFIG=tests/assets/uki-install.yaml @@ -101,9 +101,10 @@ jobs: -v $PWD/unpacked:/unpacked \ -v $PWD/build:/result \ -v $PWD/tests/assets/keys:/keys \ - quay.io/kairos/osbuilder-tools:latest build-uki dir:/unpacked \ + quay.io/kairos/auroraboot:latest build-uki \ --output-dir /result --keys /keys --output-type container \ - --single-efi-cmdline "myentry: foobar" + --single-efi-cmdline "myentry: foobar" \ + dir:/unpacked docker load -i build/*.tar image=$(docker load -i build/*.tar | grep "Loaded image" | awk -F: '{ st = index($0,":");print substr($0,st+1)}' | xargs) diff --git a/Earthfile b/Earthfile index 48ef53e9b..f91896730 100644 --- a/Earthfile +++ b/Earthfile @@ -363,12 +363,11 @@ uki-iso: IF [ "$AURORABOOT_OVERLAY_DIR" != "" ] COPY $AURORABOOT_OVERLAY_DIR /overlay-iso - RUN --no-cache echo $AURORABOOT_FLAGS | xargs auroraboot build-uki --output-dir /build/ -k /keys --output-type ${AURORABOOT_OUTPUT_TYPE} --overlay-iso /overlay-iso $BASE_IMAGE + RUN --no-cache echo $AURORABOOT_FLAGS | xargs -d' ' -I{} auroraboot build-uki --output-dir /build/ -k /keys --output-type ${AURORABOOT_OUTPUT_TYPE} --overlay-iso /overlay-iso {} $BASE_IMAGE ELSE - RUN --no-cache echo $AURORABOOT_FLAGS | xargs auroraboot build-uki --output-dir /build/ -k /keys --output-type ${AURORABOOT_OUTPUT_TYPE} $BASE_IMAGE + RUN --no-cache echo $AURORABOOT_FLAGS | xargs -d' ' -I{} auroraboot build-uki --output-dir /build/ -k /keys --output-type ${AURORABOOT_OUTPUT_TYPE} {} $BASE_IMAGE END - IF [ "$AURORABOOT_OUTPUT_TYPE" == "iso" ] SAVE ARTIFACT /build/*.iso AS LOCAL build/ ELSE IF [ "$AURORABOOT_OUTPUT_TYPE" == "container" ]