move some actions to makefile

test/Makefile

@@ -10,7 +10,6 @@ $(filter-out README.md Makefile,$(wildcard */*)):
 	$(MAKE) -w -C $(DIR) $(TARGET)
 
 install-deps:
-	if [ "$(PACKAGE_MANAGER)" =~ apt.* ]; then $(PACKAGE_MANAGER) update; fi
-	$(PACKAGE_MANAGER) install -y qemu qemu-utils xorriso unzip qemu-system-x86 netcat socat jq isomd5sum ansible make coreutils squashfs-tools
+	$(foreach DIR,$(filter-out README.md Makefile,$(wildcard *)),$(MAKE) -w -C $(DIR) install-deps;)
 
 .PHONY: all $(filter-out README.md Makefile,$(wildcard *)) $(filter-out README.md Makefile,$(wildcard */*))

test/iso/Makefile

@@ -25,4 +25,7 @@ prep:
 	sudo umount /mnt/install
 	sudo umount /mnt/iso
 
+install-deps:
+	$(install_pkg) isomd5sum coreutils squashfs-tools
+
 .PHONY: all $(ISO_TESTS)

test/vm/Makefile

@@ -1,9 +1,9 @@
-VM_TESTS=$(filter-out README.md,$(shell ls))
+VM_TESTS=$(filter-out README.md Makefile files,$(wildcard *))
 
 # Get a list of tests for the feature
 # $1 = test type
 # $2 = feature
-run_tests = \
+define run_tests
 	tests="$(shell ls tests/$(1)/$(2)_*)"; \
 	if [ -n "$$tests" ]; \
 	then \
@@ -18,8 +18,9 @@ run_tests = \
 			fi; \
 		done; \
 	fi
+endef
 
-$(VM_TESTS):
+$(VM_TESTS): start_vm ansible_inventory
 	$(eval _VARS = IMAGE_REPO IMAGE_NAME IMAGE_TAG)
 
 	ansible -i ansible_inventory -m ansible.builtin.wait_for_connection vm
@@ -37,11 +38,81 @@ ansible_inventory:
 	echo "ungrouped:" > ansible_inventory
 	echo "  hosts:" >> ansible_inventory
 	echo "    vm:" >> ansible_inventory
-	echo "      ansible_host: ${VM_IP}" >> ansible_inventory
-	echo "      ansible_port: ${VM_PORT}" >> ansible_inventory
-	echo "      ansible_user: ${VM_USER}" >> ansible_inventory
-	echo "      ansible_password: ${VM_PASS}" >> ansible_inventory
-	echo "      ansible_become_pass: ${VM_PASS}" >> ansible_inventory
+	echo "      ansible_host: $(VM_IP)" >> ansible_inventory
+	echo "      ansible_port: $(VM_PORT)" >> ansible_inventory
+	echo "      ansible_user: $(VM_USER)" >> ansible_inventory
+	echo "      ansible_password: $(VM_PASS)" >> ansible_inventory
+	echo "      ansible_become_pass: $(VM_PASS)" >> ansible_inventory
 	echo "      ansible_ssh_common_args: '-o StrictHostKeyChecking=no'" >> ansible_inventory
 
-.PHONY: $(VM_TESTS)
+.PHONY: $(VM_TESTS) install-deps
+
+install-deps:
+	$(install_pkg) qemu qemu-utils xorriso qemu-system-x86 netcat socat jq ansible
+
+files/mnt/iso:
+	$(if $(wildcard files/mnt),,mkdir files/mnt)
+	$(if $(wildcard files/mnt/iso),,mkdir files/mnt/iso)
+	sudo mount -o loop $(ISO_NAME) files/mnt/iso
+
+files/grub.cfg: files/mnt/iso
+	cp files/mnt/iso/boot/grub2/grub.cfg files/grub.cfg
+	sed -i 's/quiet/console=ttyS0,115200n8 inst.ks=cdrom:\/ks.cfg/' files/grub.cfg
+	sed -i 's/set default="1"/set default="0"/'                     files/grub.cfg
+	sed -i 's/set timeout=60/set timeout=1/'                        files/grub.cfg
+
+.PHONY: remove_files/mnt/iso
+remove_files/mnt/iso: files/mnt/iso
+	sudo umount files/mnt/iso
+	rmdir files/mnt/iso
+
+
+files/install.iso: files/grub.cfg remove_files/mnt/iso
+	xorriso -dialog on << EOF
+	-indev $(ISO_NAME)
+	-outdev files/install.iso
+	-boot_image any replay
+	-map files/ks.cfg ks.cfg
+	-chmod 0444 ks.cfg
+	-map files/grub.cfg boot/grub2/grub.cfg
+	-end
+	EOF
+
+files/disk.qcow2:
+	qemu-img create -f qcow2 files/disk.qcow2 50G
+
+.PHONY: install_os
+install_os: files/install.iso files/disk.qcow2
+	timeout 1h qemu-system-x86_64 -name "Anaconda" -boot d -m 4096 -cpu qemu64 -display none -cdrom test.iso -smp 2 -hda disk.qcow2 -serial telnet:localhost:4321,server=on,wait=off & QEMU_PID=$!
+	echo "PID: $QEMU_PID"
+	timeout 1m bash -c "while ! (echo > /dev/tcp/127.0.0.1/4321); do sleep 0.1; done"
+	(nc localhost 4321 | tee vm.stdout) &
+	wait $QEMU_PID
+
+.ONESHELL:
+
+.PHONY: start_vm
+start_vm: install_os
+	mkfifo vm.stdin
+	qemu-system-x86_64 -name "Anaconda" \
+	-m 4096 -cpu qemu64 -display none -smp 2 \
+	-chardev socket,path=/tmp/qga.sock,server=on,wait=off,id=qga0 \
+	-device e1000,netdev=net0 \
+	-netdev user,id=net0,hostfwd=tcp::${VM_PORT}-:22 \
+	-device virtio-serial \
+	-device virtserialport,chardev=qga0,name=org.qemu.guest_agent.0 \
+	-boot c -hda disk.qcow2 -serial telnet:localhost:4321,server=on,wait=off & export QEMU_PID=$!
+	echo "PID: $QEMU_PID"
+
+	timeout 1m bash -c "while ! (echo > /dev/tcp/127.0.0.1/4321); do sleep 0.1; done"
+	(tail -f vm.stdin | nc localhost 4321 | tee vm.stdout) &
+	
+	timeout 30m bash -c "while ! (echo > /dev/tcp/${VM_IP}/${VM_PORT}); do sleep 1; done"
+
+	if ! (echo > /dev/tcp/${VM_IP}/${VM_PORT})
+	then
+	echo "SSH must be installed and enabled inside the container"
+	fi
+	
+	echo "VM ready for tests at IP ${VM_IP}:${VM_PORT}"
+	$(MAKE) ansible_inventory VM_IP=${VM_IP} VM_PORT=${VM_PORT} VM_USER=core VM_PASS=foobar

test/vm/files/ks.cfg

@@ -0,0 +1,9 @@
+lang en_US.UTF-8
+keyboard us
+timezone Americas/New_York
+zerombr
+clearpart --all --initlabel
+autopart
+poweroff
+user --name=core --groups=wheel --password=foobar
+%include /usr/share/anaconda/interactive-defaults.ks