From 4c3d6586845915a86b9c6b4a7237a1991b8ac552 Mon Sep 17 00:00:00 2001
From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Date: Mon, 19 Nov 2018 16:49:16 -0500
Subject: [PATCH] Use ipxe for qemu booting

This is necessary for modules support.

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
---
 scripts/system-tests/lava2-submit.py          |  3 +--
 scripts/system-tests/template_lava_job.jinja2 | 14 +++-----------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/scripts/system-tests/lava2-submit.py b/scripts/system-tests/lava2-submit.py
index 406c984..f5a61d3 100644
--- a/scripts/system-tests/lava2-submit.py
+++ b/scripts/system-tests/lava2-submit.py
@@ -183,6 +183,7 @@ def get_vlttng_cmd(device, lttng_tools_commit, lttng_ust_commit=None):
     return vlttng_cmd
 
 def main():
+    nfsrootfs = "https://obj.internal.efficios.com/lava/rootfs/rootfs_amd64_trusty_2016-02-23-1134.tar.gz"
     test_type = None
     parser = argparse.ArgumentParser(description='Launch baremetal test using Lava')
     parser.add_argument('-t', '--type', required=True)
@@ -223,12 +224,10 @@ def main():
     if test_type in [TestType.baremetal_benchmarks, TestType.baremetal_tests]:
         device_type = DeviceType.x86
         vlttng_path = '/tmp/virtenv'
-        nfsrootfs = "/storage/jenkins-lava/rootfs/rootfs_amd64_trusty_2016-02-23-1134.tar.gz"
 
     else:
         device_type = DeviceType.kvm
         vlttng_path = '/root/virtenv'
-        nfsrootfs = "/storage/jenkins-lava/rootfs/rootfs_amd64_trusty_2016-02-23-1134.tar.gz"
 
     vlttng_cmd = get_vlttng_cmd(device_type, args.tools_commit, args.ust_commit)
 
diff --git a/scripts/system-tests/template_lava_job.jinja2 b/scripts/system-tests/template_lava_job.jinja2
index 75f7b60..448537f 100644
--- a/scripts/system-tests/template_lava_job.jinja2
+++ b/scripts/system-tests/template_lava_job.jinja2
@@ -1,4 +1,4 @@
-device_type: {{ device_type }}
+device_type: x86
 job_name: {{ job_name }}
 timeouts:
   job:
@@ -11,6 +11,8 @@ context:
   # the template uses that to ensure that qemu-system-x86_64 is executed.
   {# Used amd64 as a default #}
   arch: amd64
+tags:
+  - qemu
 {% endif %}
 {% if device_type == DeviceType.x86 %}
 tags:
@@ -48,20 +50,10 @@ actions:
     - boot:
         timeout:
           minutes: 10
-      {% if device_type == DeviceType.x86 %}
         method: ipxe
         commands: ramdisk
         prompts:
           - 'root@linaro-server:~#'
-      {% elif device_type == DeviceType.kvm %}
-        method: qemu-nfs
-        media: nfs
-        auto_login:
-          login_prompt: "kvm02 login:"
-          username: root
-        prompts:
-          - 'linaro-test'
-      {% endif %}
 
     - test:
         definitions:
-- 
2.34.1