LAVA: use sda when on kvm devices

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

diff --git a/scripts/system-tests/lava2-submit.py b/scripts/system-tests/lava2-submit.py
index 5fb3b48837170c8fbf6660fa905c36e52045ed74..26884ca6663aa237063ef7e563e4625f9128aa79 100644 (file)
--- a/scripts/system-tests/lava2-submit.py
+++ b/scripts/system-tests/lava2-submit.py
@@ -180,11 +180,10 @@ def main():
 
     if test_type in [TestType.baremetal_benchmarks, TestType.baremetal_tests]:
         device_type = DeviceType.x86
-        vlttng_path = '/tmp/virtenv'
-
     else:
         device_type = DeviceType.kvm
-        vlttng_path = '/root/virtenv'
+
+    vlttng_path = '/tmp/virtenv'
 
     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 69a62a9097abb86b3d9a732d7694d4c3f9c0b4c1..e4270e914ea3e256fd656c08f5c906179d1f0a6c 100644 (file)
--- a/scripts/system-tests/template_lava_job.jinja2
+++ b/scripts/system-tests/template_lava_job.jinja2
@@ -80,8 +80,10 @@ actions:
                     - groupadd tracing
                   {% if device_type == DeviceType.x86 %}
                     - mount /dev/sda1 /tmp
-                    - rm -rf /tmp/*
+                  {% elif device_type == DeviceType.kvm %}
+                    - mount /dev/sda /tmp
                   {% endif %}
+                    - rm -rf /tmp/*
                     - depmod -a
                     - locale-gen en_US.UTF-8
                     - apt-get update