From a8160fec19b08707e314e1f29d13488ffb3a4558 Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Mon, 15 Nov 2021 10:15:37 -0500 Subject: [PATCH] fix: lava: the base vlttng profile have the version in the name This requires that the overrides mention the correct profile otherwise the resulting yaml profile is malformed. Signed-off-by: Jonathan Rajotte --- scripts/system-tests/lava2-submit.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/system-tests/lava2-submit.py b/scripts/system-tests/lava2-submit.py index 099f6d4..00dbf93 100644 --- a/scripts/system-tests/lava2-submit.py +++ b/scripts/system-tests/lava2-submit.py @@ -139,14 +139,16 @@ def get_vlttng_cmd( # 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" + babeltrace_overrides = " --override projects.babeltrace2.build-env.PYTHON=python3 --override projects.babeltrace2.build-env.PYTHON_CONFIG=python3-config" else: babeltrace_profile = " --profile babeltrace-stable-1.5 --profile babeltrace-python" + babeltrace_overrides = " --override projects.babeltrace.build-env.PYTHON=python3 --override projects.babeltrace.build-env.PYTHON_CONFIG=python3-config" + vlttng_cmd = ( 'vlttng --jobs=$(nproc) --profile ' + urcu_profile - + ' --override projects.babeltrace.build-env.PYTHON=python3' - ' --override projects.babeltrace.build-env.PYTHON_CONFIG=python3-config' + babeltrace_profile + + babeltrace_overrides + ' --profile lttng-tools-master' ' --override projects.lttng-tools.source=' + lttng_tools_url -- 2.34.1