Merge pull request #1210 from c-po/add-image-smoketest

Testsuite: T8602: add QEMU smoketest for add-system-image over HTTP (default + VRF)

Author: sever-sever

.gitignore

@@ -6,11 +6,13 @@ packer_build/*
 packer_cache/*
 key/*
 packages/*
+rootfs/*
 !packages/*/
 /testinstall*.raw
 /testinstall*.efivars
 /ci_data
 /ci_seed.iso
+/nested_installer_payload.iso
 /*.qcow2
 /*.tar
 .DS_Store

Makefile

@@ -12,62 +12,54 @@ all:
 %:
 	./build-vyos-image $*
 
-.PHONY: checkiso
-.ONESHELL:
-checkiso:
-	if [[ ! -f $(ISO_PATH) ]]; then
-		echo "Could not find $(ISO_PATH)"
-		exit 1
-	fi
-
 .PHONY: test
 .ONESHELL:
-test: checkiso
-	scripts/check-qemu-install --debug --configd --match="$(MATCH)" --smoketest --uefi --cpu 4 --memory 8 --iso $(ISO_PATH) $(filter-out $@,$(MAKECMDGOALS))
+test:
+	scripts/check-qemu-install --debug --match="$(MATCH)" --smoketest --uefi --cpu 4 --memory 8 --iso $(ISO_PATH) $(filter-out $@,$(MAKECMDGOALS))
 
 .PHONY: test-no-interfaces
 .ONESHELL:
-test-no-interfaces: checkiso
-	scripts/check-qemu-install --debug --configd --smoketest --uefi --no-interfaces --cpu 4 --memory 8 --huge-page-size 2M --huge-page-count 1800 --isolate-cpus 2-3 --iso $(ISO_PATH) $(filter-out $@,$(MAKECMDGOALS))
+test-no-interfaces:
+	scripts/check-qemu-install --debug --smoketest --uefi --no-interfaces --cpu 4 --memory 8 --huge-page-size 2M --huge-page-count 1800 --isolate-cpus 2-3 --iso $(ISO_PATH) $(filter-out $@,$(MAKECMDGOALS))
 
 .PHONY: test-no-interfaces-no-vpp
 .ONESHELL:
-test-no-interfaces-no-vpp: checkiso
-	scripts/check-qemu-install --debug --configd --smoketest --uefi --no-interfaces --no-vpp --iso $(ISO_PATH) $(filter-out $@,$(MAKECMDGOALS))
+test-no-interfaces-no-vpp:
+	scripts/check-qemu-install --debug --smoketest --uefi --no-interfaces --no-vpp --iso $(ISO_PATH) $(filter-out $@,$(MAKECMDGOALS))
 
 .PHONY: test-interfaces
 .ONESHELL:
-test-interfaces: checkiso
-	scripts/check-qemu-install --debug --configd --match="interfaces_" --smoketest --uefi --iso $(ISO_PATH) $(filter-out $@,$(MAKECMDGOALS))
+test-interfaces:
+	scripts/check-qemu-install --debug --match="interfaces_" --smoketest --uefi --iso $(ISO_PATH) $(filter-out $@,$(MAKECMDGOALS))
 
 .PHONY: test-vpp
 .ONESHELL:
-test-vpp: checkiso
-	scripts/check-qemu-install --debug --configd --match="vpp" --smoketest --uefi --cpu 4 --memory 8 --huge-page-size 2M --huge-page-count 1800 --isolate-cpus 2-3 --iso $(ISO_PATH) $(filter-out $@,$(MAKECMDGOALS))
+test-vpp:
+	scripts/check-qemu-install --debug --match="vpp" --smoketest --uefi --cpu 4 --memory 8 --huge-page-size 2M --huge-page-count 1800 --isolate-cpus 2-3 --iso $(ISO_PATH) $(filter-out $@,$(MAKECMDGOALS))
 
 .PHONY: testc
 .ONESHELL:
-testc: checkiso
-	scripts/check-qemu-install --debug --configd --match="!vpp" --cpu 2 --memory 7 --configtest --iso $(ISO_PATH) $(filter-out $@,$(MAKECMDGOALS))
+testc:
+	scripts/check-qemu-install --debug --match="!vpp" --cpu 2 --memory 7 --configtest --iso $(ISO_PATH) $(filter-out $@,$(MAKECMDGOALS))
 
 .PHONY: testcvpp
 .ONESHELL:
-testcvpp: checkiso
-	scripts/check-qemu-install --debug --configd --match="vpp" --cpu 4 --memory 8 --huge-page-size 2M --huge-page-count 1800 --isolate-cpus 2-3 --configtest --iso $(ISO_PATH) $(filter-out $@,$(MAKECMDGOALS))
+testcvpp:
+	scripts/check-qemu-install --debug --match="vpp" --cpu 4 --memory 8 --huge-page-size 2M --huge-page-count 1800 --isolate-cpus 2-3 --configtest --iso $(ISO_PATH) $(filter-out $@,$(MAKECMDGOALS))
 
 .PHONY: testraid
 .ONESHELL:
-testraid: checkiso
-	scripts/check-qemu-install --debug --configd --raid --iso $(ISO_PATH) $(filter-out $@,$(MAKECMDGOALS))
+testraid:
+	scripts/check-qemu-install --debug --raid --iso $(ISO_PATH) $(filter-out $@,$(MAKECMDGOALS))
 
 .PHONY: testsb
 .ONESHELL:
-testsb: checkiso
+testsb:
 	scripts/check-qemu-install --debug --uefi --sbtest --iso $(ISO_PATH) $(filter-out $@,$(MAKECMDGOALS))
 
 .PHONY: testtpm
 .ONESHELL:
-testtpm: checkiso
+testtpm:
 	scripts/check-qemu-install --debug --tpmtest --iso $(ISO_PATH) $(filter-out $@,$(MAKECMDGOALS))
 
 .PHONY: test-ci-qcow2
@@ -80,15 +72,20 @@ test-ci-qcow2:
 	rm -f cloud-init-image-$(ARCH).qcow2 ; cp $$(ls -t build/*.qcow2 | head -n 1) cloud-init-image-$(ARCH).qcow2
 	scripts/check-qemu-install --debug --cloud-init --disk cloud-init-image-$(ARCH).qcow2 $(filter-out $@,$(MAKECMDGOALS))
 
+.PHONY: test-image-update
+.ONESHELL:
+test-image-update:
+	scripts/check-qemu-install --debug --test-image-update --iso $(ISO_PATH) $(filter-out $@,$(MAKECMDGOALS))
+
 .PHONY: qemu-live
 .ONESHELL:
-qemu-live: checkiso
+qemu-live:
 	scripts/check-qemu-install --qemu-cmd --iso $(ISO_PATH) $(filter-out $@,$(MAKECMDGOALS))
 
 .PHONY: oci
 .ONESHELL:
-oci: checkiso
-	scripts/iso-to-oci $(ISO_PATH)
+oci:
+	@scripts/iso-to-oci $(ISO_PATH)
 
 .PHONY: clean
 .ONESHELL:
@@ -113,7 +110,7 @@ clean:
 
 .PHONY: purge
 purge:
-	rm -rf build packer_build packer_cache testinstall-*.raw ci_data ci_seed.iso
+	rm -rf build packer_build packer_cache testinstall-*.raw ci_data ci_seed.iso nested_iso_data nested_installer_payload.iso
 
 .PHONY: ansible-install ansible-check ansible-clean
 .ONESHELL:

docker/Dockerfile

@@ -16,7 +16,7 @@
 # Must be run with --privileged flag, recommended to run the container with a
 # volume mapped in order to easy export images
 
-# This Dockerfile is installable on both x86, x86-64, armhf and arm64 systems
+# This Dockerfile is installable on x86-64 (amd64) and aarch64 (amd64) systems
 ARG ARCH=
 FROM ${ARCH}debian:bookworm-slim
 
@@ -27,14 +27,10 @@ RUN grep "VERSION_ID" /etc/os-release || (echo 'VERSION_ID="12"' >> /etc/os-rele
 
 # To install using a non-native cpu instructionset use the `--build-arg ARCH=<ARCH>/`
 # Supported architectures:
-#     arm32v6/
-#     arm32v7/
 #     arm64v8/
-# Example bo byukd natively:
+# Example to build natively:
 #     docker build -t vyos-build:rolling .
-# Example to build on armhf:
-#     docker build -t vyos-build:rolling-armhf --build-arg ARCH=arm32v7/ .
-# Example to build on arm64:
+# Example to build on arm64/aarch64:
 #     docker build -t vyos-build:rolling-arm64 --build-arg ARCH=arm64v8/ .
 
 # On some versions of docker the emulation framework is not installed by default and
@@ -45,7 +41,7 @@ LABEL authors="VyOS Maintainers <maintainers@vyos.io>" \
       org.opencontainers.image.url="https://github.com/vyos/vyos-build" \
       org.opencontainers.image.documentation="https://docs.vyos.io/en/latest/contributing/build-vyos.html" \
       org.opencontainers.image.source="https://github.com/vyos/vyos-build" \
-      org.opencontainers.image.vendor="Sentrium S.L." \
+      org.opencontainers.image.vendor="VyOS Networks" \
       org.opencontainers.image.licenses="GNU" \
       org.opencontainers.image.title="vyos-build" \
       org.opencontainers.image.description="Container to build VyOS ISO" \
@@ -134,13 +130,6 @@ RUN apt-get update && apt-get install -y \
       libpcre2-dev \
       unzip
 
-# Update certificate store to not crash ocaml package install
-# Apply fix for https in curl running on armhf
-RUN dpkg-reconfigure ca-certificates; \
-    if dpkg-architecture -iarmhf; then \
-      echo "cacert=/etc/ssl/certs/ca-certificates.crt" >> ~/.curlrc; \
-    fi
-
 # Installing OCaml needed to compile libvyosconfig
 RUN curl https://raw.githubusercontent.com/ocaml/opam/master/shell/install.sh \
       --output /tmp/opam_install.sh --retry 10 --retry-delay 5 && \
@@ -187,7 +176,6 @@ RUN git clone https://salsa.debian.org/live-team/live-build.git /tmp/live-build
     dpkg -i ../live-build*.deb && \
     rm -rf /tmp/live-build
 
-#
 # live-build: building in docker fails with mounting /proc | /sys
 #
 # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=919659
@@ -265,29 +253,28 @@ RUN GO_VERSION_INSTALL="1.23.2" ; \
     rm /tmp/go*.tar.gz
 RUN echo "export PATH=/opt/go/bin:$PATH" >> /etc/bash.bashrc
 
-# Packages needed for Qemu test-suite
-# Packages for i386 and amd64 platforms
-RUN if dpkg-architecture -ii386 || dpkg-architecture -iamd64; then \
-      apt-get update && apt-get install -y \
+# Packages needed for QEMU test-suite
+RUN apt-get update && apt-get install -y \
         python3-pexpect \
-        ovmf \
-        qemu-system-x86 \
         qemu-utils \
-        qemu-kvm; \
+        qemu-kvm
+
+# Packages for amd64 platforms
+RUN if dpkg-architecture -iamd64; then \
+      apt-get update && apt-get install -y \
+        ovmf \
+        qemu-system-x86; \
     fi
 
 # Packages for arm64 platform
 RUN if dpkg-architecture -iarm64; then \
       apt-get update && apt-get install -y \
-        python3-pexpect \
-        ipxe-qemu \
         qemu-system-aarch64 \
         qemu-efi-aarch64; \
     fi
 
-# Packages needed for building vmware and GCE images
-# This is only supported on i386 and amd64 platforms
-RUN if dpkg-architecture -ii386 || dpkg-architecture -iamd64; then \
+# Packages needed for building VMware and GCE images
+RUN if dpkg-architecture -iamd64; then \
      apt-get update && apt-get install -y \
       parted \
       udev \
@@ -318,11 +305,6 @@ RUN if dpkg-architecture -iarm64; then \
       dosfstools \
       u-boot-tools \
       grub-efi-$(dpkg-architecture -qDEB_HOST_ARCH); \
-    elif dpkg-architecture -iarmhf; then \
-    apt-get update && apt-get install -y \
-      dosfstools \
-      u-boot-tools \
-      grub-efi-arm; \
     fi
 
 # Packages needed for OWAMP/TWAMP (service sla)