Fix: system-tests: canary 2.10 lttng-ust with urcu >= 0.13 is not supported

[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 c6c131961e1aad60a121dda82799620ea9c6338d..dec07a92affb55b45e28a7289eb2255ccd41995d 100644 (file)
--- a/scripts/system-tests/lava2-submit.py
+++ b/scripts/system-tests/lava2-submit.py
@@ -127,12 +127,17 @@ def get_vlttng_cmd(
     """
     Return vlttng cmd to be used in the job template for setup.
     """
+    urcu_profile = ""
+    if lttng_version == 'master' or (major_version >= 2 and minor_version >= 11):
+        urcu_profile = "urcu-master"
+    else:
+        urcu_profile = "urcu-stable-0.12"
 
     vlttng_cmd = (
-        'vlttng --jobs=$(nproc) --profile urcu-master'
-        ' --override projects.babeltrace.build-env.PYTHON=python3'
+        'vlttng --jobs=$(nproc) --profile ' + urcu_profile
+        + ' --override projects.babeltrace.build-env.PYTHON=python3'
         ' --override projects.babeltrace.build-env.PYTHON_CONFIG=python3-config'
-        ' --profile babeltrace-stable-1.4'
+        ' --profile babeltrace-stable-1.5'
         ' --profile babeltrace-python'
         ' --profile lttng-tools-master'
         ' --override projects.lttng-tools.source='
@@ -220,6 +225,8 @@ def main():
 
     if args.lttng_version == "master":
         lttng_version_string = "master"
+    elif args.lttng_version == "canary":
+        lttng_version_string = "2.10"
     else:
         major, minor = parse_stable_version(args.lttng_version)
         lttng_version_string = str(major) + "." + str(minor)