From 418ed448ad6760015947958a80767a513460d671 Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Thu, 13 Jul 2017 03:20:33 +0000 Subject: jjb/common: add LAVA templating for QEMU LAVA jobs for QEMU have some slight differences compared to u-boot jobs. Add templating to support QEMU jobs for any arch. Change-Id: I6ef8e92cc169d8365f0ba1cb568b961d49e2a74f Signed-off-by: Kevin Hilman --- jjb/common/include-agl-run-test-short.sh | 50 +++++++++++++++++++++++++++++--- 1 file changed, 46 insertions(+), 4 deletions(-) (limited to 'jjb/common/include-agl-run-test-short.sh') diff --git a/jjb/common/include-agl-run-test-short.sh b/jjb/common/include-agl-run-test-short.sh index 6897fde5..bdbd2283 100644 --- a/jjb/common/include-agl-run-test-short.sh +++ b/jjb/common/include-agl-run-test-short.sh @@ -25,10 +25,6 @@ cat < testjob.yaml device_type: @REPLACE_DEVICE_TYPE@ job_name: AGL-short-smoke -protocols: - lava-xnbd: - port: auto - timeouts: job: minutes: 30 @@ -38,6 +34,14 @@ timeouts: minutes: 5 priority: medium visibility: public +EOF + +if [ ${DEVICE_BOOT_METHOD} = "u-boot" ]; then +cat <> testjob.yaml + +protocols: + lava-xnbd: + port: auto # ACTION_BLOCK actions: @@ -69,19 +73,57 @@ actions: username: root EOF +fi + +if [ ${DEVICE_BOOT_METHOD} = "qemu" ]; then +cat <>testjob.yaml +context: + no_kvm: true + arch: @REPLACE_DEVICE_ARCH@ + extra_options: [@REPLACE_QEMU_ARGS@] + +actions: +- deploy: + timeout: + minutes: 3 + to: tmpfs + os: oe + images: + kernel: + image_arg: '-kernel {kernel} -append @REPLACE_KERNEL_CMDLINE@' + url: '@REPLACE_URL_PREFIX@/@REPLACE_KERNEL@' + ramdisk: + image_arg: '-drive format=raw,file={ramdisk}' + url: '@REPLACE_URL_PREFIX@/@REPLACE_INITRAMFS@' + compression: @REPLACE_INITRAMFS_COMPRESSION@ + +- boot: + method: @REPLACE_BOOT_METHOD@ + media: tmpfs + prompts: ["root@@REPLACE_MACHINE@:~"] + auto_login: + login_prompt: "login:" + username: root + +EOF +fi CHID=${GERRIT_CHANGE_NUMBER}/${GERRIT_PATCHSET_NUMBER}/${MACHINE} # REPLACE_DEVICE_TYPE +sed -i -e "s#@REPLACE_DEVICE_ARCH@#${DEVICE_ARCH}#g" testjob.yaml sed -i -e "s#@REPLACE_DEVICE_TYPE@#${DEVICE_TYPE}#g" testjob.yaml sed -i -e "s#@REPLACE_DTB@#${CHID}/${DEVICE_DTB}#g" testjob.yaml sed -i -e "s#@REPLACE_KERNEL@#${CHID}/${DEVICE_KERNEL}#g" testjob.yaml sed -i -e "s#@REPLACE_INITRAMFS@#${CHID}/${DEVICE_INITRAMFS}#g" testjob.yaml +sed -i -e "s#@REPLACE_INITRAMFS_COMPRESSION@#${DEVICE_INITRAMFS_COMPRESSION}#g" testjob.yaml sed -i -e "s#@REPLACE_NBDROOT@#${CHID}/${DEVICE_NBDROOT}#g" testjob.yaml sed -i -e "s#@REPLACE_NBDROOT_COMPRESSION@#${DEVICE_NBDROOT_COMPRESSION}#g" testjob.yaml sed -i -e "s#@REPLACE_BOOT_METHOD@#${DEVICE_BOOT_METHOD}#g" testjob.yaml sed -i -e "s#@REPLACE_BOOT_TYPE@#${DEVICE_BOOT_TYPE}#g" testjob.yaml sed -i -e "s#@REPLACE_MACHINE@#${DEVICE_NAME}#g" testjob.yaml sed -i -e "s#@REPLACE_URL_PREFIX@#${DEVICE_URL_PREFIX}#g" testjob.yaml +sed -i -e "s#@REPLACE_QEMU_ARGS@#${DEVICE_QEMU_ARGS}#g" testjob.yaml +sed -i -e "s#@REPLACE_KERNEL_CMDLINE@#${DEVICE_KERNEL_CMDLINE}#g" testjob.yaml cat testjob.yaml -- cgit 1.2.3-korg