Skip to content

Commit affeba8

Browse files
Update Docker workflow to use Ubuntu Noble (#26)
* Update Docker workflow to use Ubuntu Noble & Vulcanexus Kilted Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Allow breaking system packages to install colcon Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> * Restore Vulcanexus Jazzy Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com> --------- Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>
1 parent 5608f69 commit affeba8

4 files changed

Lines changed: 10 additions & 6 deletions

File tree

.github/docker/ddsenabler/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:24.04
22
LABEL author=raul@eprosima.com
33

44
# Avoid interactuation with installation of some package that needs the locale.
@@ -30,7 +30,7 @@ RUN apt-get update && apt-get install --yes --no-install-recommends \
3030
libyaml-cpp-dev
3131

3232
# Install required python modules
33-
RUN pip3 install \
33+
RUN pip3 install --break-system-packages \
3434
colcon-common-extensions \
3535
colcon-mixin \
3636
lxml \

.github/workflows/docker-reusable-workflow.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ env:
5454
jobs:
5555
docker-test:
5656

57-
runs-on: ubuntu-22.04
57+
runs-on: ubuntu-24.04
5858

5959
env:
6060
DDSENABLER_COMPOSE_TEST_DOCKER_IMAGE: "ddsenabler:ci"
@@ -101,7 +101,7 @@ jobs:
101101
- name: Download dependencies and install requirements
102102
uses: ./src/.github/actions/project_dependencies
103103
with:
104-
os: ubuntu-22.04
104+
os: ubuntu-24.04
105105
cmake_build_type: "Release"
106106
dependencies_artifact_postfix: ${{ inputs.dependencies_artifact_postfix }}
107107
secret_token: ${{ secrets.GITHUB_TOKEN }}

ddsenabler_test/compose/scripts/execute_and_validate_listener.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
import log
1818

19+
import os
20+
1921
import validation
2022

2123
DESCRIPTION = """Script to validate listeners output"""
@@ -78,7 +80,7 @@ def _listener_command(args):
7880
"""
7981
command = [
8082
'python3',
81-
'/opt/ros/jazzy/lib/demo_nodes_py/listener']
83+
f'/opt/ros/{os.environ["ROS_DISTRO"]}/lib/demo_nodes_py/listener']
8284

8385
return command
8486

ddsenabler_test/compose/scripts/execute_and_validate_talker.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
import log
1818

19+
import os
20+
1921
import validation
2022

2123
DESCRIPTION = """Script to validate talkers output"""
@@ -67,7 +69,7 @@ def _talker_command(args):
6769
"""
6870
command = [
6971
'python3',
70-
'/opt/ros/jazzy/lib/demo_nodes_py/talker']
72+
f'/opt/ros/{os.environ["ROS_DISTRO"]}/lib/demo_nodes_py/talker']
7173

7274
return command
7375

0 commit comments

Comments
 (0)