Merge "jjb/common: add LAVA templating for QEMU"

1 files changed, 4 insertions, 2 deletions

diff --git a/jjb/common/include-agl-run-test-prepare.sh b/jjb/common/include-agl-run-test-prepare.sh
index 388fb535..4d3f10f6 100644
--- a/jjb/common/include-agl-run-test-prepare.sh
+++ b/jjb/common/include-agl-run-test-prepare.sh
@@ -4,7 +4,7 @@
 ################################################################################
 ## Run SHORT CI test
 ################################################################################
-#set -x
+set -x
 
 #ls -alh
 #pwd
@@ -42,11 +42,13 @@ if [ ! -f $ENVFILE ] ; then
 fi
 
 # some defaults
+export DEVICE_ARCH=arm
 export DEVICE_TYPE=raspberrypi3-uboot
 export DEVICE_NAME=raspberrypi3
 export DEVICE_DTB=uImage-bcm2710-rpi-3-b.dtb
 export DEVICE_KERNEL=uImage
 export DEVICE_INITRAMFS=initramfs-netboot-image-raspberrypi3.ext4
+export DEVICE_INITRAMFS_COMPRESSION=false
 export DEVICE_NBDROOT=agl-demo-platform-raspberrypi3.ext4
 export DEVICE_NBDROOT_COMPRESSION=false
 export DEVICE_BOOT_METHOD=u-boot
@@ -55,7 +57,7 @@ export DEVICE_URL_PREFIX='https://download.automotivelinux.org/AGL/upload/ci/'
 
 
 # import device defaults. Format 'a=b'
-for i in DEVICE_TYPE DEVICE_NAME DEVICE_DTB DEVICE_KERNEL DEVICE_INITRAMFS DEVICE_NBDROOT DEVICE_NBDROOT_COMPRESSION DEVICE_BOOT_METHOD DEVICE_BOOT_TYPE DEVICE_URL_PREFIX; do
+for i in DEVICE_ARCH DEVICE_TYPE DEVICE_NAME DEVICE_DTB DEVICE_KERNEL DEVICE_INITRAMFS DEVICE_INITRAMFS_COMPRESSION DEVICE_NBDROOT DEVICE_NBDROOT_COMPRESSION DEVICE_BOOT_METHOD DEVICE_BOOT_TYPE DEVICE_URL_PREFIX DEVICE_QEMU_ARGS DEVICE_KERNEL_CMDLINE; do
     if grep -q ^$i $ENVFILE ; then
         X=$(grep $i $ENVFILE | sed -e "s#${i}=##g" -e "s#;.*##g")
         eval export ${i}=${X}