From e640b6d8e772b853df483a3b6160708e72e5b1e3 Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Fri, 30 Nov 2018 11:38:39 -0500 Subject: [PATCH] LAVA: use sda when on kvm devices Signed-off-by: Jonathan Rajotte --- scripts/system-tests/lava2-submit.py | 5 ++--- scripts/system-tests/template_lava_job.jinja2 | 4 +++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/system-tests/lava2-submit.py b/scripts/system-tests/lava2-submit.py index 5fb3b48..26884ca 100644 --- 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 69a62a9..e4270e9 100644 --- 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 -- 2.34.1