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

[lttng-ci.git] / scripts / system-tests / lava2-submit.py

diff --git a/scripts/system-tests/lava2-submit.py b/scripts/system-tests/lava2-submit.py
index 47cc61080416f31f386baf0269903218b963364f..0553b8810b64aa422d3a31b7f5142066a9f3980d 100644 (file)
--- 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