X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Fsystem-tests%2Flava2-submit.py;h=9565f0c8003c088f5bac3ecdff0419ed55f31e0e;hb=befee704a53c9f232a2133a28b0ca5f46458fc99;hp=614a1a973b301748f6d89a9247f7435faad304a4;hpb=c2f8bcb90801a37d5e32a1465ebfe85d8d7f66a8;p=lttng-ci.git

diff --git a/scripts/system-tests/lava2-submit.py b/scripts/system-tests/lava2-submit.py
index 614a1a9..9565f0c 100644
--- a/scripts/system-tests/lava2-submit.py
+++ b/scripts/system-tests/lava2-submit.py
@@ -18,6 +18,7 @@ import argparse
 import json
 import os
 import random
+import re
 import sys
 import time
 import xmlrpc.client
@@ -37,12 +38,10 @@ class TestType:
     baremetal_benchmarks = 1
     baremetal_tests = 2
     kvm_tests = 3
-    kvm_fuzzing_tests = 4
     values = {
         'baremetal-benchmarks': baremetal_benchmarks,
         'baremetal-tests': baremetal_tests,
         'kvm-tests': kvm_tests,
-        'kvm-fuzzing-tests': kvm_fuzzing_tests,
     }
 
 
@@ -125,13 +124,14 @@ def print_test_output(server, job):
             continue
         if line['msg'] == '<LAVA_SIGNAL_ENDTC run-tests>':
             print('----- TEST SUITE OUTPUT END -----')
-            break
+            print_line = False
+            continue
         if print_line:
             print("{} {}".format(line['dt'], line['msg']))
 
 
 def get_vlttng_cmd(
-    lttng_tools_url, lttng_tools_commit, lttng_ust_url=None, lttng_ust_commit=None
+    lttng_version, lttng_tools_url, lttng_tools_commit, lttng_ust_url=None, lttng_ust_commit=None
 ):
     """
     Return vlttng cmd to be used in the job template for setup.
@@ -161,6 +161,23 @@ def get_vlttng_cmd(
             + ' --profile lttng-ust-no-man-pages'
         )
 
+
+    # Get the major and minor version numbers from the lttng version string.
+    version_match = re.search('stable-(\d).(\d\d)', lttng_version)
+
+    if version_match is not None:
+        major_version = int(version_match.group(1))
+        minor_version = int(version_match.group(2))
+    else:
+        # Setting to zero to make the comparison below easier.
+        major_version = 0
+        minor_version = 0
+
+    if lttng_version == 'master' or (major_version >= 2 and minor_version >= 11):
+        vlttng_cmd += (
+            ' --override projects.lttng-tools.configure+=--enable-test-sdt-uprobe'
+        )
+
     vlttng_path = '/tmp/virtenv'
 
     vlttng_cmd += ' ' + vlttng_path
@@ -173,6 +190,7 @@ def main():
     test_type = None
     parser = argparse.ArgumentParser(description='Launch baremetal test using Lava')
     parser.add_argument('-t', '--type', required=True)
+    parser.add_argument('-lv', '--lttng-version', required=True)
     parser.add_argument('-j', '--jobname', required=True)
     parser.add_argument('-k', '--kernel', required=True)
     parser.add_argument('-lm', '--lmodule', required=True)
@@ -216,7 +234,7 @@ def main():
     vlttng_path = '/tmp/virtenv'
 
     vlttng_cmd = get_vlttng_cmd(
-        args.tools_url, args.tools_commit, args.ust_url, args.ust_commit
+        args.lttng_version, args.tools_url, args.tools_commit, args.ust_url, args.ust_commit
     )
 
     context = dict()