🔧 merge custom mounts tests (#814)

* 🔧 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 <oz@spectrocloud.com>

* Refactor tests

Works with VBox, fails with QEMU

Signed-off-by: Oz Tiram <oz@spectrocloud.com>

* Fix cloud-config identation

Signed-off-by: Oz Tiram <oz@spectrocloud.com>

---------

Signed-off-by: Oz Tiram <oz@spectrocloud.com>
This commit is contained in:
Oz Tiram
2023-02-07 17:19:33 +01:00
committed by Itxaka
parent ee1e77efbe
commit 11de7129e0

View File

@@ -493,27 +493,6 @@ run-qemu-datasource-tests:
RUN PATH=$PATH:$GOPATH/bin ginkgo -v --label-filter "$TEST_SUITE" --fail-fast -r ./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: run-qemu-netboot-test:
FROM +ginkgo FROM +ginkgo