From 30989989e6bf18a4e67708f697417345a8c77d1e Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Mon, 15 Nov 2021 09:46:51 -0500 Subject: [PATCH] lava: use babeltrace2 for lttng >= 2.14 (master) for testing Signed-off-by: Jonathan Rajotte --- scripts/system-tests/lava2-submit.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/scripts/system-tests/lava2-submit.py b/scripts/system-tests/lava2-submit.py index b9af830..099f6d4 100644 --- a/scripts/system-tests/lava2-submit.py +++ b/scripts/system-tests/lava2-submit.py @@ -136,13 +136,18 @@ def get_vlttng_cmd( else: urcu_profile = "urcu-stable-0.12" + # Starting with 2.14, babeltrace2 is the reader for testing. + if lttng_version == 'master' or (major_version >= 2 and minor_version >= 14): + babeltrace_profile = " --profile babeltrace2-stable-2.0 --profile babeltrace2-python" + else: + babeltrace_profile = " --profile babeltrace-stable-1.5 --profile babeltrace-python" + vlttng_cmd = ( '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.5' - ' --profile babeltrace-python' - ' --profile lttng-tools-master' + + babeltrace_profile + + ' --profile lttng-tools-master' ' --override projects.lttng-tools.source=' + lttng_tools_url + ' --override projects.lttng-tools.checkout=' -- 2.34.1