tests/ci: make buildimage and runtest independent

This allows us to use ci-runtest on a pre-existing CI disk image.
It will be helpful in CI environments (such as ci.freebsd.org) where
building and testing are separated into distinct jobs.

Signed-off-by: Siva Mahadevan <[email protected]>
Sponsored by: The FreeBSD Foundation

Author: svmhdvn

tests/ci/Makefile

@@ -177,7 +177,7 @@ clean: beforeclean .PHONY
 
 cleandir: beforeclean .PHONY
 
-ci-buildworld: .PHONY
+ci-buildworld: ci-checktarget .PHONY
 	@echo "Building world for ${TARGET_ARCH}"
 	${IMAKE} -j${PARALLEL_JOBS} -C ${WORLDDIR} ${METAMODE} \
 		${CROSS_TOOLCHAIN_PARAM} __MAKE_CONF=${MAKECONF} SRCCONF=${SRCCONF} \
@@ -228,7 +228,9 @@ ci-extract-meta: .PHONY
 	rm -rf ${META_TAR} ${META_DIR} ${META_DIROUT}
 .endif
 
-ci-runtest: ci-buildimage-${TARGET_ARCH:tl} portinstall .PHONY
+ci-runtest: ci-create-meta portinstall .WAIT ci-runtest-${TARGET_ARCH:tl} .WAIT ci-extract-meta .PHONY
+
+ci-runtest-qemu: .PHONY
 	timeout -k 60 ${TIMEOUT_VM} ${QEMUBIN} \
 		-machine ${QEMU_MACHINE} \
 		-smp ${QEMU_CPU_COUNT} \
@@ -254,6 +256,6 @@ ci-checktarget: .PHONY
 	@echo "Error: ${TARGET_ARCH} is not supported on ${TYPE} ${REVISION} ${BRANCH}"
 .endif
 
-ci: ci-create-meta ci-checktarget .WAIT ci-runtest-${TARGET_ARCH:tl} .WAIT ci-extract-meta .PHONY
+ci: ci-buildimage-${TARGET_ARCH:tl} .WAIT ci-runtest .PHONY
 
 .include "${RELEASEDIR}/Makefile.inc1"

tests/ci/Makefile.aarch64

@@ -27,7 +27,7 @@ portinstall-aarch64: portinstall-pkg .PHONY
 	env ASSUME_ALWAYS_YES=yes pkg install sysutils/u-boot-bhyve-arm64
 .endif
 
-ci-runtest-aarch64: ci-buildimage-aarch64 .PHONY
+ci-runtest-aarch64: .PHONY
 	/usr/sbin/bhyvectl --vm=${TEST_VM_NAME} --destroy || true
 	expect -c "set timeout ${TIMEOUT_EXPECT}; \
 		spawn /usr/bin/timeout -k 60 ${TIMEOUT_VM} /usr/sbin/bhyve \
@@ -47,5 +47,5 @@ portinstall-aarch64: portinstall-pkg .PHONY
 	env ASSUME_ALWAYS_YES=yes pkg install sysutils/u-boot-qemu-arm64
 .endif
 
-ci-runtest-aarch64: ci-runtest .PHONY
+ci-runtest-aarch64: ci-runtest-qemu .PHONY
 .endif

tests/ci/Makefile.amd64

@@ -24,7 +24,7 @@ ci-buildkernel-amd64: ci-buildkernel .PHONY
 ci-buildimage-amd64: ci-buildimage .PHONY
 
 .if ${MACHINE} == "amd64" && ( !defined(USE_QEMU) || empty(USE_QEMU) )
-ci-runtest-amd64: ci-buildimage-amd64 .PHONY
+ci-runtest-amd64: .PHONY
 	/usr/sbin/bhyvectl --vm=${TEST_VM_NAME} --destroy || true
 	expect -c "set timeout ${TIMEOUT_EXPECT}; \
 		spawn /usr/bin/timeout -k 5s 30s /usr/sbin/bhyveload \
@@ -44,5 +44,5 @@ ci-runtest-amd64: ci-buildimage-amd64 .PHONY
 		expect { eof }"
 	/usr/sbin/bhyvectl --vm=${TEST_VM_NAME} --destroy
 .else
-ci-runtest-amd64: ci-runtest .PHONY
+ci-runtest-amd64: ci-runtest-qemu .PHONY
 .endif

tests/ci/Makefile.armv7

@@ -26,4 +26,4 @@ ci-buildkernel-armv7: ci-buildkernel .PHONY
 
 ci-buildimage-armv7: ci-buildimage .PHONY
 
-ci-runtest-armv7: ci-runtest .PHONY
+ci-runtest-armv7: ci-runtest-qemu .PHONY

tests/ci/Makefile.powerpc64

@@ -24,4 +24,4 @@ ci-buildkernel-powerpc64: ci-buildkernel .PHONY
 
 ci-buildimage-powerpc64: ci-buildimage .PHONY
 
-ci-runtest-powerpc64: ci-runtest .PHONY
+ci-runtest-powerpc64: ci-runtest-qemu .PHONY

tests/ci/Makefile.powerpc64le

@@ -24,4 +24,4 @@ ci-buildkernel-powerpc64le: ci-buildkernel .PHONY
 
 ci-buildimage-powerpc64le: ci-buildimage .PHONY
 
-ci-runtest-powerpc64le: ci-runtest .PHONY
+ci-runtest-powerpc64le: ci-runtest-qemu .PHONY

tests/ci/Makefile.riscv64

@@ -28,4 +28,4 @@ ci-buildkernel-riscv64: ci-buildkernel .PHONY
 
 ci-buildimage-riscv64: ci-buildimage .PHONY
 
-ci-runtest-riscv64: ci-runtest .PHONY
+ci-runtest-riscv64: ci-runtest-qemu .PHONY