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 <jonathan.rajotte-julien@efficios.com>

diff --git a/scripts/system-tests/lava2-submit.py b/scripts/system-tests/lava2-submit.py
index 099f6d4e23b1955f8aad9a541b216c9394039e54..00dbf933363cc608de10db8738c3de998ae4392d 100644 (file)
--- 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