Stop deleting the .earthlyignore and use PREBUILT_ISO ARG instead

Signed-off-by: Ettore Di Giacinto <ettore@spectrocloud.com>
This commit is contained in:
Dimitris Karakasilis
2023-03-03 17:48:20 +02:00
committed by Itxaka
parent ed7f6c989f
commit bd2dcd9300

View File

@@ -560,7 +560,6 @@ run-qemu-datasource-tests:
ENV CLOUD_CONFIG=$CLOUD_CONFIG ENV CLOUD_CONFIG=$CLOUD_CONFIG
COPY . . COPY . .
RUN ls -liah /test/build
IF [ -n "$PREBUILT_ISO" ] IF [ -n "$PREBUILT_ISO" ]
ENV ISO=$PREBUILT_ISO ENV ISO=$PREBUILT_ISO
ELSE ELSE
@@ -622,6 +621,7 @@ run-qemu-test:
RUN apt install -y qemu-system-x86 qemu-utils git && apt clean RUN apt install -y qemu-system-x86 qemu-utils git && apt clean
ARG FLAVOR ARG FLAVOR
ARG TEST_SUITE=upgrade-with-cli ARG TEST_SUITE=upgrade-with-cli
ARG PREBUILT_ISO
ARG CONTAINER_IMAGE ARG CONTAINER_IMAGE
ENV CONTAINER_IMAGE=$CONTAINER_IMAGE ENV CONTAINER_IMAGE=$CONTAINER_IMAGE
ENV FLAVOR=$FLAVOR ENV FLAVOR=$FLAVOR
@@ -632,8 +632,8 @@ run-qemu-test:
ENV GOPATH="/go" ENV GOPATH="/go"
COPY . . COPY . .
IF [ -e /build/kairos.iso ] IF [ -n "$PREBUILT_ISO" ]
ENV ISO=/build/kairos.iso ENV ISO=$PREBUILT_ISO
ELSE ELSE
COPY +iso/kairos.iso kairos.iso COPY +iso/kairos.iso kairos.iso
ENV ISO=/build/kairos.iso ENV ISO=/build/kairos.iso