Install liblttng-ctl-dev instead of python3-lttng in Rolling (#725)

Signed-off-by: Christophe Bedard <[email protected]>

linux_docker_resources/Dockerfile

@@ -90,8 +90,12 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
 RUN if test \( ${UBUNTU_DISTRO} = jammy -a ${ROS_DISTRO} != humble \); then apt-get update && apt-get install --no-install-recommends -y \
   liblttng-ust-dev \
   lttng-tools \
-  python3-babeltrace \
+  python3-babeltrace; fi
+# Iron uses python3-lttng, but then starting after Iron we switch to liblttng-ctl-dev.
+RUN if test \( ${UBUNTU_DISTRO} = jammy -a ${ROS_DISTRO} = iron \); then apt-get update && apt-get install --no-install-recommends -y \
   python3-lttng; fi
+RUN if test \( ${UBUNTU_DISTRO} = jammy -a ${ROS_DISTRO} = rolling \); then apt-get update && apt-get install --no-install-recommends -y \
+  liblttng-ctl-dev; fi
 
 # Install clang if build arg is true
 RUN if test ${COMPILE_WITH_CLANG} = true; then apt-get update && apt-get install --no-install-recommends -y clang libc++-dev libc++abi-dev; fi

linux_docker_resources/Dockerfile-RHEL

@@ -115,6 +115,7 @@ RUN dnf install \
     libyaml-devel \
     libzstd-devel \
     $(if test ${EL_RELEASE/.*/} != 8; then echo lttng-tools; fi) \
+    $(if test ${EL_RELEASE/.*/} != 8 -a ${ROS_DISTRO} = rolling; then echo lttng-tools-devel; fi) \
     $(if test ${EL_RELEASE/.*/} != 8; then echo lttng-ust-devel; fi) \
     mesa-libGL-devel \
     mesa-libGLU-devel \
@@ -136,7 +137,7 @@ RUN dnf install \
     python3-importlib-metadata \
     $(if test ${EL_RELEASE/.*/} = 8; then echo python3-importlib-resources; fi) \
     python3-lark-parser \
-    $(if test ${EL_RELEASE/.*/} != 8; then echo python3-lttng; fi) \
+    $(if test ${EL_RELEASE/.*/} != 8 -a ${ROS_DISTRO} != rolling; then echo python3-lttng; fi) \
     python3-lxml \
     python3-matplotlib \
     $(if test ${EL_RELEASE/.*/} = 8; then echo python3-mock; fi) \