From ed7f6c989fd37e83f65588dba76fc8305d00f824 Mon Sep 17 00:00:00 2001 From: Ettore Di Giacinto Date: Fri, 3 Mar 2023 15:54:32 +0200 Subject: [PATCH] Fix bundle tests The `rm` we did, made the repo "dirty" thus changing the kubo extention version. This result in a kubo version that doesn't match the one in /etc/os-release, so systemd-sysext doesn't show the extension. https://www.freedesktop.org/software/systemd/man/systemd-sysext.html#Options Fixes: https://github.com/kairos-io/kairos/issues/1029 Signed-off-by: Dimitris Karakasilis --- Earthfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Earthfile b/Earthfile index dd6b063..3af89b7 100644 --- a/Earthfile +++ b/Earthfile @@ -548,6 +548,7 @@ run-qemu-datasource-tests: RUN apt install -y qemu-system-x86 qemu-utils golang git WORKDIR /test ARG FLAVOR + ARG PREBUILT_ISO ARG TEST_SUITE=autoinstall-test ENV FLAVOR=$FLAVOR ENV SSH_PORT=60023 @@ -560,8 +561,8 @@ run-qemu-datasource-tests: ENV CLOUD_CONFIG=$CLOUD_CONFIG COPY . . RUN ls -liah /test/build - IF [ -e /test/build/kairos.iso ] - ENV ISO=/test/build/kairos.iso + IF [ -n "$PREBUILT_ISO" ] + ENV ISO=$PREBUILT_ISO ELSE COPY +iso/kairos.iso kairos.iso ENV ISO=/test/kairos.iso @@ -707,7 +708,8 @@ prepare-bundles-tests: run-qemu-bundles-tests: ARG FLAVOR - BUILD +run-qemu-datasource-tests --CLOUD_CONFIG=./bundles-config.yaml --TEST_SUITE="bundles-test" --FLAVOR=$FLAVOR + ARG PREBUILT_ISO + BUILD +run-qemu-datasource-tests --PREBUILT_ISO=$PREBUILT_ISO --CLOUD_CONFIG=./bundles-config.yaml --TEST_SUITE="bundles-test" --FLAVOR=$FLAVOR ### ### Examples