From bd2dcd9300ab99f14eddc69d8768803f580717b8 Mon Sep 17 00:00:00 2001 From: Dimitris Karakasilis Date: Fri, 3 Mar 2023 17:48:20 +0200 Subject: [PATCH] Stop deleting the .earthlyignore and use PREBUILT_ISO ARG instead Signed-off-by: Ettore Di Giacinto --- Earthfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Earthfile b/Earthfile index 3af89b7..c0934e7 100644 --- a/Earthfile +++ b/Earthfile @@ -560,7 +560,6 @@ run-qemu-datasource-tests: ENV CLOUD_CONFIG=$CLOUD_CONFIG COPY . . - RUN ls -liah /test/build IF [ -n "$PREBUILT_ISO" ] ENV ISO=$PREBUILT_ISO ELSE @@ -622,6 +621,7 @@ run-qemu-test: RUN apt install -y qemu-system-x86 qemu-utils git && apt clean ARG FLAVOR ARG TEST_SUITE=upgrade-with-cli + ARG PREBUILT_ISO ARG CONTAINER_IMAGE ENV CONTAINER_IMAGE=$CONTAINER_IMAGE ENV FLAVOR=$FLAVOR @@ -632,8 +632,8 @@ run-qemu-test: ENV GOPATH="/go" COPY . . - IF [ -e /build/kairos.iso ] - ENV ISO=/build/kairos.iso + IF [ -n "$PREBUILT_ISO" ] + ENV ISO=$PREBUILT_ISO ELSE COPY +iso/kairos.iso kairos.iso ENV ISO=/build/kairos.iso