[elbe-devel] [PATCH v2 07/10] tests: simple-armhf.xml: use /vmlinux and /initrd.img links as artifacts

Torben Hohn torben.hohn at linutronix.de
Fri May 7 08:51:23 CEST 2021


The actual names of the vmlinuz and initrd.img files include
version numbers, and change over time. This results in continuous
failures of the tests.

The artifact code will follow symlinks. So just use the automatically
generated links as the artifact.

The dtb file is also located in a directory containing a version number.
Copy it to /boot and then generate /dtb link mocking /vmlinuz and
/initrd.img. Make sure that the link is relative, becaue its evaluated
in the context of the initvm.

Signed-off-by: Torben Hohn <torben.hohn at linutronix.de>
---
 tests/simple-armhf.xml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/tests/simple-armhf.xml b/tests/simple-armhf.xml
index c26ef8a7f..2894bc83d 100644
--- a/tests/simple-armhf.xml
+++ b/tests/simple-armhf.xml
@@ -63,9 +63,13 @@
 				192.168.0.165  mydomain  mydomain-host
 			</file>
 			<cp path="/etc/bash.bashrc">/root/.bashrc</cp>
-			<artifact>/boot/vmlinuz-4.19.0-14-armmp</artifact>
-			<artifact>/boot/initrd.img-4.19.0-14-armmp</artifact>
-			<artifact>/usr/lib/linux-image-4.19.0-14-armmp/vexpress-v2p-ca15-tc1.dtb</artifact>
+
+			<cp path="/usr/lib/linux-image-4.19.0-*-armmp/vexpress-v2p-ca15-tc1.dtb">/boot/vexpress-v2p-ca15-tc1.dtb</cp>
+			<ln path="boot/vexpress-v2p-ca15-tc1.dtb">/dtb</ln>
+
+			<artifact>/vmlinuz</artifact>
+			<artifact>/initrd.img</artifact>
+			<artifact>/dtb</artifact>
 		</finetuning>
 
 		<project-finetuning>
@@ -75,7 +79,7 @@
 		<check>
 			<img>sda.img.tar.gz</img>
 			<interpreter>qemu-system-arm</interpreter>
-			<interpreter-opts>-m 2G -M vexpress-a15 -drive format=raw,file=$ELBE_IMG -nographic -kernel vmlinuz-4.19.0-14-armmp -initrd initrd.img-4.19.0-14-armmp -dtb vexpress-v2p-ca15-tc1.dtb</interpreter-opts>
+			<interpreter-opts>-m 2G -M vexpress-a15 -drive format=raw,file=$ELBE_IMG -nographic -kernel vmlinuz -initrd initrd.img -dtb dtb</interpreter-opts>
 			<action> <login /> </action>
 		</check>
 	</check-image-list>
-- 
2.20.1



More information about the elbe-devel mailing list