From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Date: Wed, 21 Nov 2018 20:34:05 +0000 (-0500)
Subject: LAVA: Use bash as first step to spawn a bash shell
X-Git-Url: http://git.liburcu.org/?a=commitdiff_plain;h=6af14904ac64adeb74b494b7f7f27c83795d90f4;p=lttng-ci.git

LAVA: Use bash as first step to spawn a bash shell

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

diff --git a/lava/system-tests/kernel-tests.yml b/lava/system-tests/kernel-tests.yml
index a5db623..ac0f39e 100644
--- a/lava/system-tests/kernel-tests.yml
+++ b/lava/system-tests/kernel-tests.yml
@@ -11,6 +11,7 @@ install:
                 - echo "$(pwd)/coredump/core.%e.%p.%h.%t" > /proc/sys/kernel/core_pattern
 run:
         steps:
+                - bash
                 - source /root/lttngvenv/activate
                 - cd /root/lttngvenv/src/lttng-tools
                 - lava-test-case build-test-suite --shell "make"
diff --git a/scripts/system-tests/lava2-submit.py b/scripts/system-tests/lava2-submit.py
index 47cc610..0553b88 100644
--- a/scripts/system-tests/lava2-submit.py
+++ b/scripts/system-tests/lava2-submit.py
@@ -157,7 +157,7 @@ def print_test_output(server, job):
                             print('----- TEST SUITE OUTPUT END -----')
                             break
 
-def get_vlttng_cmd(device, lttng_tools_commit, lttng_ust_commit=None):
+def get_vlttng_cmd(device, lttng_tools_commit, lttng_ust_commit=None, vlttng_path="/tmp/virtenv"):
 
     vlttng_cmd = 'vlttng --jobs=$(nproc) --profile urcu-master' \
                     ' --override projects.babeltrace.build-env.PYTHON=python3' \
@@ -173,17 +173,13 @@ def get_vlttng_cmd(device, lttng_tools_commit, lttng_ust_commit=None):
                     ' --override projects.lttng-ust.checkout='+lttng_ust_commit+ \
                     ' --profile lttng-ust-no-man-pages'
 
-    if device is DeviceType.kvm:
-        vlttng_path = '/root/virtenv'
-    else:
-        vlttng_path = '/tmp/virtenv'
-
     vlttng_cmd += ' ' + vlttng_path
 
     return vlttng_cmd
 
 def main():
     nfsrootfs = "https://obj.internal.efficios.com/lava/rootfs/rootfs_amd64_trusty_2016-02-23-1134.tar.gz"
+    vlttng_path = '/tmp/virtenv'
     test_type = None
     parser = argparse.ArgumentParser(description='Launch baremetal test using Lava')
     parser.add_argument('-t', '--type', required=True)
@@ -222,13 +218,12 @@ 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_cmd = get_vlttng_cmd(device_type, args.tools_commit, args.ust_commit)
+    vlttng_cmd = get_vlttng_cmd(device_type, args.tools_commit,
+            args.ust_commit, vlttng_path=vlttng_path)
 
     context = dict()
     context['DeviceType'] = DeviceType
diff --git a/scripts/system-tests/template_lava_job.jinja2 b/scripts/system-tests/template_lava_job.jinja2
index 02201a1..599e58a 100644
--- a/scripts/system-tests/template_lava_job.jinja2
+++ b/scripts/system-tests/template_lava_job.jinja2
@@ -68,8 +68,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