Makefile: T8602: move validation if ISO exists into individual scripts

Sometimes I do call scripts/check-qemu-install directly without the Makefile
wrapper, thus it should be ensured that the ISO image exists also from within
the test-case launcher, too.

Author: c-po

.gitignore

@@ -6,6 +6,7 @@ packer_build/*
 packer_cache/*
 key/*
 packages/*
+rootfs/*
 !packages/*/
 /testinstall*.raw
 /testinstall*.efivars

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
+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
+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
+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
+test-interfaces:
 	scripts/check-qemu-install --debug --match="interfaces_" --smoketest --uefi --iso $(ISO_PATH) $(filter-out $@,$(MAKECMDGOALS))
 
 .PHONY: test-vpp
 .ONESHELL:
-test-vpp: checkiso
+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
+testc:
 	scripts/check-qemu-install --debug --match="!vpp" --cpu 2 --memory 7 --configtest --iso $(ISO_PATH) $(filter-out $@,$(MAKECMDGOALS))
 
 .PHONY: testcvpp
 .ONESHELL:
-testcvpp: checkiso
+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
+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
@@ -82,13 +74,13 @@ test-ci-qcow2:
 
 .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:

scripts/check-qemu-install

@@ -396,8 +396,9 @@ if not args.disk:
     tmp_disk_random = "%04x" % random.randint(0,65535)
     args.disk = f'testinstall-{tmp_disk_time}-{tmp_disk_random}{DISK_IMAGE_EXTENSION}'
 
-if not args.iso or not os.path.isfile(args.iso):
-    log.debug('Unable to find ISO image to install ...')
+if args.iso and not os.path.isfile(args.iso):
+    log.error('Unable to find VyOS ISO image needed by testcases!')
+    sys.exit(1)
 
 OVMF_CODE = '/usr/share/OVMF/OVMF_CODE_4M.secboot.fd'
 OVMF_VARS_TMP = args.disk.replace(DISK_IMAGE_EXTENSION, '.efivars')

scripts/iso-to-oci

@@ -11,17 +11,23 @@ function cleanup() {
 
 if [[ $(/usr/bin/id -u) -ne 0 ]]; then
     echo "Not running as root"
-    exit
+    exit 1
 fi
 
 if [ "$#" -ne 1 ]; then
     echo "Illegal number of parameters"
+    exit 1
 fi
 
 ISO=$1
 ROOTFS=rootfs
 UNSQUASHFS=unsquashfs
 
+if [ ! -f "$ISO" ]; then
+    echo "E: Unable to find VyOS ISO image \"$ISO\" required for conversion"
+    exit 1
+fi
+
 # ensure clean working directory
 cleanup