Merge pull request #746 from osrf/ros2_testing_target_noble

[ros2] migrate 'testing' image to noble
osrf · May 2, 2024 · 345f9da · 345f9da
2 parents 84e9969 + 318b9a6
commit 345f9da
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/.github/workflows/ros2_ci.yaml b/.github/workflows/ros2_ci.yaml
@@ -8,6 +8,7 @@ on:
     - '.github/workflows/ros2_ci.yaml'
     - 'ros2/nightly/**'
     - 'ros2/source/**'
+    - 'ros2/testing/**'
   push:
     branches-ignore:
     - 'master'
@@ -16,12 +17,14 @@ on:
     - '.github/workflows/ros2_ci.yaml'
     - 'ros2/nightly/**'
     - 'ros2/source/**'
+    - 'ros2/testing/**'
 jobs:
   build_images:
     strategy:
       fail-fast: false
       matrix:
         env:
+          - {HUB_REPO: ros2, HUB_RELEASE: testing}
           - {HUB_REPO: ros2, HUB_RELEASE: source}
           - {HUB_REPO: ros2, HUB_RELEASE: nightly}
     runs-on: ubuntu-latest

diff --git a/ros2/testing/testing/Dockerfile b/ros2/testing/testing/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:jammy-20240416
+FROM ubuntu:noble-20240429
 
 # setup timezone
 RUN echo 'Etc/UTC' > /etc/timezone && \
@@ -24,7 +24,7 @@ RUN set -eux; \
        rm -rf "$GNUPGHOME"
 
 # setup sources.list
-RUN echo "deb [ signed-by=/usr/share/keyrings/ros2-testing-archive-keyring.gpg ] http://packages.ros.org/ros2-testing/ubuntu jammy main" > /etc/apt/sources.list.d/ros2-testing.list
+RUN echo "deb [ signed-by=/usr/share/keyrings/ros2-testing-archive-keyring.gpg ] http://packages.ros.org/ros2-testing/ubuntu noble main" > /etc/apt/sources.list.d/ros2-testing.list
 
 # setup environment
 ENV LANG C.UTF-8
@@ -53,6 +53,10 @@ RUN colcon mixin add default \
       https://raw.githubusercontent.com/colcon/colcon-metadata-repository/master/index.yaml && \
     colcon metadata update
 
+# install environment file for sourcing environment in entrypoint
+RUN apt-get update && apt-get install --no-install-recommends -y \
+    ros-rolling-ros-environment \
+    && rm -rf /var/lib/apt/lists/*
 # setup entrypoint
 COPY ./ros_entrypoint.sh /