From 11de7129e04d5ca8d77a84f316ced4b8e0ea4d39 Mon Sep 17 00:00:00 2001 From: Oz Tiram Date: Tue, 7 Feb 2023 17:19:33 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20merge=20custom=20mounts=20tests?= =?UTF-8?q?=20(#814)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 🔧 merge custom mounts tests Since the feature is now merged, we no longer need a single label for this. This saves a few CI cycles. To acheive this, we add the correct sections to the normal install sections and assert that these paths exist. The previous assertions are kept, but in order to make code a bit more readable, I extracted the anonymous function that collects the data from the installed VM. Instead of repeating the installation 4 times, we now only repeat the installation 2 times. Signed-off-by: Oz Tiram * Refactor tests Works with VBox, fails with QEMU Signed-off-by: Oz Tiram * Fix cloud-config identation Signed-off-by: Oz Tiram --------- Signed-off-by: Oz Tiram --- Earthfile | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/Earthfile b/Earthfile index 02e184e..615c415 100644 --- a/Earthfile +++ b/Earthfile @@ -493,27 +493,6 @@ run-qemu-datasource-tests: RUN PATH=$PATH:$GOPATH/bin ginkgo -v --label-filter "$TEST_SUITE" --fail-fast -r ./tests/ -run-qemu-custom-mount-tests: - FROM +ginkgo - RUN apt install -y qemu-system-x86 qemu-utils git && apt clean - ARG FLAVOR - - COPY . . - RUN ls -liah - IF [ -e /build/kairos.iso ] - ENV ISO=/build/kairos.iso - ELSE - COPY +iso/kairos.iso kairos.iso - ENV ISO=/build/kairos.iso - END - - ENV GOPATH="/go" - ARG TEST_SUITE=custom-mounts-test - ENV SSH_PORT=60024 - ENV CREATE_VM=true - ENV USE_QEMU=true - RUN pwd && ls -liah - RUN PATH=$PATH:$GOPATH/bin ginkgo -v --label-filter custom-mounts-test --fail-fast -r ./tests/ run-qemu-netboot-test: FROM +ginkgo