From 3b6b74a9c0015209ca39bd865b16caedb5f97b80 Mon Sep 17 00:00:00 2001 From: juanlofer-eprosima <88179026+juanlofer-eprosima@users.noreply.github.com> Date: Tue, 10 Jun 2025 07:31:09 +0200 Subject: [PATCH 1/2] Upgrade testing Vulcanexus image to Jazzy (#510) * Regenerate security certificates Signed-off-by: Juan Lopez Fernandez * Refs #23043: Upgrade docker to jazzy Signed-off-by: cferreiragonz * Apply suggestions Signed-off-by: Juan Lopez Fernandez --------- Signed-off-by: Juan Lopez Fernandez Signed-off-by: cferreiragonz Co-authored-by: cferreiragonz --- .github/docker/vulcanexus/Dockerfile | 13 +++++++++---- .github/workflows/docker-reusable-workflow.yml | 2 +- .../scripts/execute_and_validate_listener.py | 4 +++- .../compose/scripts/execute_and_validate_talker.py | 4 +++- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/.github/docker/vulcanexus/Dockerfile b/.github/docker/vulcanexus/Dockerfile index 60fc91ca3..95c5f2c3f 100644 --- a/.github/docker/vulcanexus/Dockerfile +++ b/.github/docker/vulcanexus/Dockerfile @@ -16,14 +16,19 @@ SHELL ["/bin/bash", "-c"] ARG docker_image_base RUN echo "Docker Base image used: ${docker_image_base}" +# TODO: Remove once external issue is solved +# Update ROS 2 keys (not updated in the base image as of June 2025) +RUN rm /etc/apt/sources.list.d/ros2-latest.list && \ + curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -o /usr/share/keyrings/ros-archive-keyring.gpg && \ + echo "deb [signed-by=/usr/share/keyrings/ros-archive-keyring.gpg] http://packages.ros.org/ros2/ubuntu $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/ros2.list > /dev/null + # Install message interface and demo nodes required packages RUN source "/opt/vulcanexus/$VULCANEXUS_DISTRO/setup.bash" && \ apt-get update && \ apt-get install -y \ - ros-humble-example-interfaces \ - ros-humble-example-interfaces \ - ros-humble-demo-nodes-cpp \ - ros-humble-demo-nodes-py + ros-$VULCANEXUS_DISTRO-example-interfaces \ + ros-$VULCANEXUS_DISTRO-demo-nodes-cpp \ + ros-$VULCANEXUS_DISTRO-demo-nodes-py # Copy and use run.bash as entrypoint COPY run.bash /root/run.bash diff --git a/.github/workflows/docker-reusable-workflow.yml b/.github/workflows/docker-reusable-workflow.yml index 2a521878c..8b8e351ac 100644 --- a/.github/workflows/docker-reusable-workflow.yml +++ b/.github/workflows/docker-reusable-workflow.yml @@ -72,7 +72,7 @@ jobs: cd ./src/.github/docker/vulcanexus docker build \ --no-cache \ - --build-arg docker_image_base=eprosima/vulcanexus:humble-core \ + --build-arg docker_image_base=eprosima/vulcanexus:jazzy-core \ -t ${{ env.DDSROUTER_COMPOSE_TEST_ROS2_DOCKER_IMAGE }} \ -f Dockerfile . diff --git a/ddsrouter_test/compose/scripts/execute_and_validate_listener.py b/ddsrouter_test/compose/scripts/execute_and_validate_listener.py index 035228cd8..44c98268c 100644 --- a/ddsrouter_test/compose/scripts/execute_and_validate_listener.py +++ b/ddsrouter_test/compose/scripts/execute_and_validate_listener.py @@ -16,6 +16,8 @@ import log +import os + import validation DESCRIPTION = """Script to validate listeners output""" @@ -72,7 +74,7 @@ def _listener_command(args): """ command = [ 'python3', - '/opt/ros/humble/lib/demo_nodes_py/listener'] + f'/opt/ros/{os.environ["ROS_DISTRO"]}/lib/demo_nodes_py/listener'] return command diff --git a/ddsrouter_test/compose/scripts/execute_and_validate_talker.py b/ddsrouter_test/compose/scripts/execute_and_validate_talker.py index 61f75efe0..bda9cab47 100644 --- a/ddsrouter_test/compose/scripts/execute_and_validate_talker.py +++ b/ddsrouter_test/compose/scripts/execute_and_validate_talker.py @@ -16,6 +16,8 @@ import log +import os + import validation DESCRIPTION = """Script to validate talkers output""" @@ -67,7 +69,7 @@ def _talker_command(args): """ command = [ 'python3', - '/opt/ros/humble/lib/demo_nodes_py/talker'] + f'/opt/ros/{os.environ["ROS_DISTRO"]}/lib/demo_nodes_py/talker'] return command From c77d532221aa043a2736de377c6829a526a1ebba Mon Sep 17 00:00:00 2001 From: cferreiragonz Date: Thu, 12 Jun 2025 16:29:28 +0200 Subject: [PATCH 2/2] Remove temp fix for ROS 2 keys Signed-off-by: cferreiragonz --- .github/docker/vulcanexus/Dockerfile | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/docker/vulcanexus/Dockerfile b/.github/docker/vulcanexus/Dockerfile index 95c5f2c3f..f5f709d64 100644 --- a/.github/docker/vulcanexus/Dockerfile +++ b/.github/docker/vulcanexus/Dockerfile @@ -16,12 +16,6 @@ SHELL ["/bin/bash", "-c"] ARG docker_image_base RUN echo "Docker Base image used: ${docker_image_base}" -# TODO: Remove once external issue is solved -# Update ROS 2 keys (not updated in the base image as of June 2025) -RUN rm /etc/apt/sources.list.d/ros2-latest.list && \ - curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -o /usr/share/keyrings/ros-archive-keyring.gpg && \ - echo "deb [signed-by=/usr/share/keyrings/ros-archive-keyring.gpg] http://packages.ros.org/ros2/ubuntu $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/ros2.list > /dev/null - # Install message interface and demo nodes required packages RUN source "/opt/vulcanexus/$VULCANEXUS_DISTRO/setup.bash" && \ apt-get update && \