Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Use auroraboot everywhere and position flags correctly
Browse files Browse the repository at this point in the history
because they are ignored if the come after positional arguments

Signed-off-by: Dimitris Karakasilis <[email protected]>
jimmykarily committed Nov 28, 2024

Verified

This commit was signed with the committer’s verified signature.
jimmykarily Dimitris Karakasilis
1 parent 4decad7 commit d9967f4
Showing 2 changed files with 6 additions and 6 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/reusable-uki-test.yaml
Original file line number Diff line number Diff line change
@@ -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)
5 changes: 2 additions & 3 deletions Earthfile
Original file line number Diff line number Diff line change
@@ -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

Check failure on line 366 in Earthfile

GitHub Actions / test-uki (fedora, rhel, 40, fedora:40, core) / test-uki

Error

The command 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 did not complete successfully. Exit code 123

Check failure on line 366 in Earthfile

GitHub Actions / test-uki (ubuntu, 24.04, ubuntu, ubuntu:24.04, core) / test-uki

Error

The command 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 did not complete successfully. Exit code 123
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" ]

0 comments on commit d9967f4

Please sign in to comment.