From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Date: Wed, 21 Nov 2018 17:09:42 +0000 (-0500)
Subject: Use job context to pass kernel and nfs parameters
X-Git-Url: http://git.lttng.org./?a=commitdiff_plain;h=620516c23a8a9acce64017f029e471d2bdcd2422;hp=11dcad455bad4ba7c8da2a7bbf21ad9844bcd651;p=lttng-ci.git

Use job context to pass kernel and nfs parameters

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
---

diff --git a/lava/devices/kvm1.jinja2 b/lava/devices/kvm1.jinja2
index 24e91ba..a48d284 100644
--- a/lava/devices/kvm1.jinja2
+++ b/lava/devices/kvm1.jinja2
@@ -5,6 +5,5 @@
 {% set power_on_command = 'virsh --connect qemu:///system reset kvm1' %}
 {% set soft_reset_command = 'reboot' %}
 {% set boot_interface = 'net0' %}
-{% set kernel_extra_args = 'cpuidle.off=1 nfsrootdebug' %}
 {% set boot_character_delay = '100' %}
 {% set test_character_delay = '100' %}
diff --git a/lava/devices/kvm2.jinja2 b/lava/devices/kvm2.jinja2
index 10785ee..5242d16 100644
--- a/lava/devices/kvm2.jinja2
+++ b/lava/devices/kvm2.jinja2
@@ -5,6 +5,5 @@
 {% set power_on_command = 'virsh --connect qemu:///system reset kvm2' %}
 {% set soft_reset_command = 'reboot' %}
 {% set boot_interface = 'net0' %}
-{% set kernel_extra_args = 'cpuidle.off=1 nfsrootdebug' %}
 {% set boot_character_delay = '100' %}
 {% set test_character_delay = '100' %}
diff --git a/scripts/system-tests/template_lava_job.jinja2 b/scripts/system-tests/template_lava_job.jinja2
index 58d0b17..898c066 100644
--- a/scripts/system-tests/template_lava_job.jinja2
+++ b/scripts/system-tests/template_lava_job.jinja2
@@ -7,10 +7,9 @@ priority: medium
 visibility: public
 {% if device_type == DeviceType.kvm %}
 context:
-  # tell the qemu template which architecture is being tested
-  # the template uses that to ensure that qemu-system-x86_64 is executed.
-  {# Used amd64 as a default #}
-  arch: amd64
+  extra_kernel_args: cpuidle.off=1
+  extra_nfsroot_args: ,nfsver=3 nfsrootdebug
+
 tags:
   - qemu
 {% endif %}