From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Date: Wed, 21 Nov 2018 21:04:55 +0000 (-0500)
Subject: Revert "LAVA: Use bash as first step to spawn a bash shell"
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=c11ec858266c0b9b3cc163ed1783b49f02800046;p=lttng-ci.git

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

This reverts commit 6af14904ac64adeb74b494b7f7f27c83795d90f4.

Since the bash process does not return lava hang there.

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 ac0f39e..a5db623 100644
--- a/lava/system-tests/kernel-tests.yml
+++ b/lava/system-tests/kernel-tests.yml
@@ -11,7 +11,6 @@ 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 0553b88..47cc610 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, vlttng_path="/tmp/virtenv"):
+def get_vlttng_cmd(device, lttng_tools_commit, lttng_ust_commit=None):
 
     vlttng_cmd = 'vlttng --jobs=$(nproc) --profile urcu-master' \
                     ' --override projects.babeltrace.build-env.PYTHON=python3' \
@@ -173,13 +173,17 @@ def get_vlttng_cmd(device, lttng_tools_commit, lttng_ust_commit=None, vlttng_pat
                     ' --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)
@@ -218,12 +222,13 @@ 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_path=vlttng_path)
+    vlttng_cmd = get_vlttng_cmd(device_type, args.tools_commit, args.ust_commit)
 
     context = dict()
     context['DeviceType'] = DeviceType
diff --git a/scripts/system-tests/template_lava_job.jinja2 b/scripts/system-tests/template_lava_job.jinja2
index 599e58a..02201a1 100644
--- a/scripts/system-tests/template_lava_job.jinja2
+++ b/scripts/system-tests/template_lava_job.jinja2
@@ -68,10 +68,8 @@ actions:
                     - groupadd tracing
                   {% if device_type == DeviceType.x86 %}
                     - mount /dev/sda1 /tmp
-                  {% elif device_type == DeviceType.kvm %}
-                    - mount /dev/sda /tmp
-                  {% endif %}
                     - rm -rf /tmp/*
+                  {% endif %}
                     - depmod -a
                     - locale-gen en_US.UTF-8
                     - apt-get update