[elbe-devel] [PATCH 2/9] tests simple-amd64-with-grub-tighten: make it build a bootable system

[Torben Hohn]

Signed-off-by: Torben Hohn <torben.hohn at linutronix.de>
---
 tests/simple-amd64-with-grub-tighten.xml | 32 ++++++++++++++++++++----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/tests/simple-amd64-with-grub-tighten.xml b/tests/simple-amd64-with-grub-tighten.xml
index 3a777c66d..65283c423 100644
--- a/tests/simple-amd64-with-grub-tighten.xml
+++ b/tests/simple-amd64-with-grub-tighten.xml
@@ -26,10 +26,9 @@
 		<domain>elbe-ci</domain>
 		<passwd>root</passwd>
 		<console>ttyS0,115200</console>
-		<debootstrapvariant>minbase</debootstrapvariant>
 
 		<images>
-			<gpthd>
+			<msdoshd>
 				<name>sda.img</name>
 				<size>2000MiB</size>
 				<grub-install />
@@ -37,7 +36,7 @@
 					<size>remain</size>
 					<label>rfs</label>
 				</partition>
-			</gpthd>
+			</msdoshd>
 		</images>
 
 		<fstab>
@@ -49,10 +48,11 @@
 		</fstab>
 
 		<pkg-list>
-		  <pkg>busybox-static</pkg>
+		  <pkg>grub-pc</pkg>
+		  <pkg>linux-image-amd64</pkg>
+		  <pkg>systemd</pkg>
 		</pkg-list>
 
-		<tighten />
 		<install-recommends />
 
 		<finetuning>
@@ -63,4 +63,26 @@
 			<artifact>/etc/hosts</artifact>
 		</finetuning>
 	</target>
+	<check-image-list>
+		<check>
+			<img>sda.img.tar.gz</img>
+			<interpreter>qemu-system-x86_64</interpreter>
+
+			<!--
+			OVMF.fd might be in a different directory than
+			/usr/share/qemu on some distros.
+
+			Use the Qemu's option '-L help' to determine the list
+			of directories.  e.g. on Arch Linux, the option
+			'-L /usr/share/edk2-ovmf/x64' should be used.
+
+			This could be done using variant, but we need to
+			figure out a way to pass variants from elbe-ci to
+			elbe-check-build first.
+			-->
+			<interpreter-opts>-m 2G -enable-kvm -cpu host -drive format=raw,file=$ELBE_IMG -nographic</interpreter-opts>
+
+			<action> <login /> </action>
+		</check>
+	</check-image-list>
 </ns0:RootFileSystem>
-- 
2.20.1