Switch Rolling to use Ubuntu resolute.

.github/workflows/ros_ci.yaml

@@ -6,15 +6,17 @@ on:
     paths:
     - '.ci/**'
     - '.github/workflows/ros_ci.yaml'
-    # - 'ros/rolling/**'
+    - 'ros/rolling/**'
+    - 'ros/lyrical/**'
     - 'ros/kilted/**'
     - 'ros/jazzy/**'
     - 'ros/humble/**'
   push:
     paths:
     - '.ci/**'
     - '.github/workflows/ros_ci.yaml'
-    # - 'ros/rolling/**'
+    - 'ros/rolling/**'
+    - 'ros/lyrical/**'
     - 'ros/kilted/**'
     - 'ros/jazzy/**'
     - 'ros/humble/**'
@@ -27,7 +29,8 @@ jobs:
       fail-fast: false
       matrix:
         env:
-          # - {HUB_REPO: ros, HUB_RELEASE: rolling, HUB_OS_NAME: ubuntu, HUB_OS_CODE_NAME: noble}
+          - {HUB_REPO: ros, HUB_RELEASE: rolling, HUB_OS_NAME: ubuntu, HUB_OS_CODE_NAME: resolute}
+          - {HUB_REPO: ros, HUB_RELEASE: lyrical, HUB_OS_NAME: ubuntu, HUB_OS_CODE_NAME: resolute}
           - {HUB_REPO: ros, HUB_RELEASE: kilted, HUB_OS_NAME: ubuntu, HUB_OS_CODE_NAME: noble}
           - {HUB_REPO: ros, HUB_RELEASE: jazzy, HUB_OS_NAME: ubuntu, HUB_OS_CODE_NAME: noble}
           - {HUB_REPO: ros, HUB_RELEASE: humble, HUB_OS_NAME: ubuntu, HUB_OS_CODE_NAME: jammy}

ros/manifest.yaml

@@ -672,31 +672,30 @@ release_names:
                                 aliases:
                                     - "$release_name-perception"
                                     - "$release_name-perception-$os_code_name"
-    # FIXME Disable rolling currently broken
-    # rolling:
-    #     eol: 2022-05
-    #     os_names:
-    #         ubuntu:
-    #             os_code_names:
-    #                 noble:
-    #                     <<: *DEFAULT_ROS2
-    #                     archs:
-    #                         - amd64
-    #                         - arm64v8
-    #                     tag_names:
-    #                         ros-core:
-    #                             aliases:
-    #                                 - "$release_name-ros-core"
-    #                                 - "$release_name-ros-core-$os_code_name"
-    #                         ros-base:
-    #                             aliases:
-    #                                 - "$release_name-ros-base"
-    #                                 - "$release_name-ros-base-$os_code_name"
-    #                                 - "$release_name"
-    #                         perception:
-    #                             aliases:
-    #                                 - "$release_name-perception"
-    #                                 - "$release_name-perception-$os_code_name"
+    rolling:
+        eol: 2031-05
+        os_names:
+            ubuntu:
+                os_code_names:
+                    resolute:
+                        <<: *DEFAULT_ROS2
+                        archs:
+                            - amd64
+                            - arm64v8
+                        tag_names:
+                            ros-core:
+                                aliases:
+                                    - "$release_name-ros-core"
+                                    - "$release_name-ros-core-$os_code_name"
+                            ros-base:
+                                aliases:
+                                    - "$release_name-ros-base"
+                                    - "$release_name-ros-base-$os_code_name"
+                                    - "$release_name"
+                            perception:
+                                aliases:
+                                    - "$release_name-perception"
+                                    - "$release_name-perception-$os_code_name"
 meta:
     maintainers:
         - Tully Foote <tfoote+buildfarm@osrfoundation.org> (@tfoote)

ros/rolling/ubuntu/resolute/Makefile

@@ -0,0 +1,78 @@
+all: help
+
+help:
+	@echo ""
+	@echo "-- Help Menu"
+	@echo ""
+	@echo "   1. make build            - build all images"
+	@echo "   2. make pull             - pull all images"
+	@echo "   3. make clean            - remove all images"
+	@echo ""
+
+build:
+	@docker build --tag=ros:rolling-ros-core-resolute			ros-core/.
+	@docker build --tag=ros:rolling-ros-base-resolute			ros-base/.
+	@docker build --tag=ros:rolling-perception-resolute			perception/.
+	# @docker build --tag=osrf/ros:rolling-simulation-resolute			simulation/.
+	# @docker build --tag=osrf/ros:rolling-desktop-resolute			desktop/.
+	# @docker build --tag=osrf/ros:rolling-desktop-full-resolute			desktop-full/.
+
+pull:
+	@docker pull ros:rolling-ros-core-resolute
+	@docker pull ros:rolling-ros-base-resolute
+	@docker pull ros:rolling-perception-resolute
+	# @docker pull osrf/ros:rolling-simulation-resolute
+	# @docker pull osrf/ros:rolling-desktop-resolute
+	# @docker pull osrf/ros:rolling-desktop-full-resolute
+
+clean:
+	@docker rmi -f ros:rolling-ros-core-resolute
+	@docker rmi -f ros:rolling-ros-base-resolute
+	@docker rmi -f ros:rolling-perception-resolute
+	# @docker rmi -f osrf/ros:rolling-simulation-resolute
+	# @docker rmi -f osrf/ros:rolling-desktop-resolute
+	# @docker rmi -f osrf/ros:rolling-desktop-full-resolute
+
+ci_buildx:
+	@docker buildx build --pull --push \
+		--cache-from=type=registry,ref=osrf/ros:rolling-desktop-resolute \
+		--cache-to=type=inline \
+		--tag=osrf/ros:rolling-desktop-resolute \
+		desktop/.
+	@if [ "ubuntu" = "ubuntu" ]; then \
+		docker pull \
+			osrf/ros:rolling-desktop-resolute; \
+		docker tag \
+			osrf/ros:rolling-desktop-resolute \
+			osrf/ros:rolling-desktop; \
+		docker push \
+			osrf/ros:rolling-desktop; \
+	fi
+	@docker buildx build --pull --push \
+		--cache-from=type=registry,ref=osrf/ros:rolling-simulation-resolute \
+		--cache-to=type=inline \
+		--tag=osrf/ros:rolling-simulation-resolute \
+		simulation/.
+	@if [ "ubuntu" = "ubuntu" ]; then \
+		docker pull \
+			osrf/ros:rolling-simulation-resolute; \
+		docker tag \
+			osrf/ros:rolling-simulation-resolute \
+			osrf/ros:rolling-simulation; \
+		docker push \
+			osrf/ros:rolling-simulation; \
+	fi
+	@docker buildx build --pull --push \
+		--cache-from=type=registry,ref=osrf/ros:rolling-desktop-full-resolute \
+		--cache-to=type=inline \
+		--tag=osrf/ros:rolling-desktop-full-resolute \
+		desktop-full/.
+	@if [ "ubuntu" = "ubuntu" ]; then \
+		docker pull \
+			osrf/ros:rolling-desktop-full-resolute; \
+		docker tag \
+			osrf/ros:rolling-desktop-full-resolute \
+			osrf/ros:rolling-desktop-full; \
+		docker push \
+			osrf/ros:rolling-desktop-full; \
+	fi

ros/rolling/ubuntu/resolute/desktop-full/Dockerfile

@@ -0,0 +1,9 @@
+# This is an auto generated Dockerfile for ros:desktop-full
+# generated from docker_images_ros2/create_ros_image.Dockerfile.em
+FROM osrf/ros:rolling-desktop-resolute
+
+# install ros2 packages
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    ros-rolling-desktop-full=0.13.0-1* \
+    && rm -rf /var/lib/apt/lists/*
+

ros/rolling/ubuntu/resolute/desktop/Dockerfile

@@ -0,0 +1,9 @@
+# This is an auto generated Dockerfile for ros:desktop
+# generated from docker_images_ros2/create_ros_image.Dockerfile.em
+FROM ros:rolling-ros-base-resolute
+
+# install ros2 packages
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    ros-rolling-desktop=0.13.0-1* \
+    && rm -rf /var/lib/apt/lists/*
+

ros/rolling/ubuntu/resolute/images.yaml.em

@@ -0,0 +1,54 @@
+%YAML 1.1
+# ROS2 Dockerfile database
+---
+images:
+    ros-core:
+        base_image: @(os_name):@(os_code_name)
+        maintainer_name: @(maintainer_name)
+        template_name: docker_images_ros2/create_ros_core_image.Dockerfile.em
+        entrypoint_name: docker_images_ros2/ros_entrypoint.sh
+        template_packages:
+            - docker_templates
+        ros2_packages:
+            - ros-core
+    ros-base:
+        base_image: @(user_name):@(ros2distro_name)-ros-core-@(os_code_name)
+        maintainer_name: @(maintainer_name)
+        template_name: docker_images_ros2/create_ros_image.Dockerfile.em
+        template_packages:
+            - docker_templates
+        ros2_packages:
+            - ros-base
+        bootstrap_ros_tools:
+    perception:
+        base_image: @(user_name):@(ros2distro_name)-ros-base-@(os_code_name)
+        maintainer_name: @(maintainer_name)
+        template_name: docker_images_ros2/create_ros_image.Dockerfile.em
+        template_packages:
+            - docker_templates
+        ros2_packages:
+            - perception
+    simulation:
+        base_image: @(user_name):@(ros2distro_name)-ros-base-@(os_code_name)
+        maintainer_name: @(maintainer_name)
+        template_name: docker_images_ros2/create_ros_image.Dockerfile.em
+        template_packages:
+            - docker_templates
+        ros2_packages:
+            - simulation
+    desktop:
+        base_image: @(user_name):@(ros2distro_name)-ros-base-@(os_code_name)
+        maintainer_name: @(maintainer_name)
+        template_name: docker_images_ros2/create_ros_image.Dockerfile.em
+        template_packages:
+            - docker_templates
+        ros2_packages:
+            - desktop
+    desktop-full:
+        base_image: osrf/@(user_name):@(ros2distro_name)-desktop-@(os_code_name)
+        maintainer_name: @(maintainer_name)
+        template_name: docker_images_ros2/create_ros_image.Dockerfile.em
+        template_packages:
+            - docker_templates
+        ros2_packages:
+            - desktop-full

ros/rolling/ubuntu/resolute/perception/Dockerfile

@@ -0,0 +1,9 @@
+# This is an auto generated Dockerfile for ros:perception
+# generated from docker_images_ros2/create_ros_image.Dockerfile.em
+FROM ros:rolling-ros-base-resolute
+
+# install ros2 packages
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    ros-rolling-perception=0.13.0-1* \
+    && rm -rf /var/lib/apt/lists/*
+

ros/rolling/ubuntu/resolute/platform.yaml

@@ -0,0 +1,12 @@
+%YAML 1.1
+# ROS2 Dockerfile database
+---
+platform:
+    os_name: ubuntu
+    os_code_name: resolute
+    ros2distro_name: rolling
+    user_name: ros
+    maintainer_name:
+    arch: amd64
+    type: distribution
+    version:

ros/rolling/ubuntu/resolute/ros-base/Dockerfile

@@ -0,0 +1,31 @@
+# This is an auto generated Dockerfile for ros:ros-base
+# generated from docker_images_ros2/create_ros_image.Dockerfile.em
+FROM ros:rolling-ros-core-resolute
+
+# install bootstrap tools
+RUN apt-get update && apt-get install --no-install-recommends -y \
+    build-essential \
+    git \
+    python3-colcon-common-extensions \
+    python3-colcon-mixin \
+    python3-rosdep \
+    python3-vcstool \
+    && rm -rf /var/lib/apt/lists/*
+
+# bootstrap rosdep
+RUN rosdep init && \
+  rosdep update --rosdistro $ROS_DISTRO
+
+# setup colcon mixin and metadata
+RUN colcon mixin add default \
+      https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml && \
+    colcon mixin update && \
+    colcon metadata add default \
+      https://raw.githubusercontent.com/colcon/colcon-metadata-repository/master/index.yaml && \
+    colcon metadata update
+
+# install ros2 packages
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    ros-rolling-ros-base=0.13.0-1* \
+    && rm -rf /var/lib/apt/lists/*
+

ros/rolling/ubuntu/resolute/ros-core/Dockerfile

@@ -0,0 +1,44 @@
+# This is an auto generated Dockerfile for ros:ros-core
+# generated from docker_images_ros2/create_ros_core_image.Dockerfile.em
+FROM ubuntu:resolute
+
+# setup timezone
+RUN echo 'Etc/UTC' > /etc/timezone && \
+    ln -s /usr/share/zoneinfo/Etc/UTC /etc/localtime && \
+    apt-get update && \
+    apt-get install -q -y --no-install-recommends tzdata && \
+    rm -rf /var/lib/apt/lists/*
+
+# install packages
+RUN apt-get update && apt-get install -q -y --no-install-recommends \
+    ca-certificates \
+    curl \
+    dirmngr \
+    gnupg2 \
+    && rm -rf /var/lib/apt/lists/*
+
+
+# Setup ROS Apt sources
+RUN curl -L -s -o /tmp/ros2-apt-source.deb https://github.com/ros-infrastructure/ros-apt-source/releases/download/1.2.0/ros2-apt-source_1.2.0.resolute_all.deb \
+    && echo "0804d9b13db770eb87019be414cd78378835228ad5fa801fc88758596dd8f7e5 /tmp/ros2-apt-source.deb" | sha256sum --strict --check \
+    && apt-get update \
+    && apt-get install /tmp/ros2-apt-source.deb \
+    && rm -f /tmp/ros2-apt-source.deb \
+    && rm -rf /var/lib/apt/lists/*
+
+# setup environment
+ENV LANG=C.UTF-8
+ENV LC_ALL=C.UTF-8
+
+ENV ROS_DISTRO=rolling
+
+# install ros2 packages
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    ros-rolling-ros-core=0.13.0-1* \
+    && rm -rf /var/lib/apt/lists/*
+
+# setup entrypoint
+COPY ./ros_entrypoint.sh /
+
+ENTRYPOINT ["/ros_entrypoint.sh"]
+CMD ["bash"]

ros/rolling/ubuntu/resolute/ros-core/ros_entrypoint.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+set -e
+
+# setup ros2 environment
+source "/opt/ros/$ROS_DISTRO/setup.bash" --
+exec "$@"

ros/rolling/ubuntu/resolute/simulation/Dockerfile

@@ -0,0 +1,9 @@
+# This is an auto generated Dockerfile for ros:simulation
+# generated from docker_images_ros2/create_ros_image.Dockerfile.em
+FROM ros:rolling-ros-base-resolute
+
+# install ros2 packages
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    ros-rolling-simulation=0.13.0-1* \
+    && rm -rf /var/lib/apt/lists/*
+

ros/ros

@@ -93,20 +93,20 @@ Directory: ros/lyrical/ubuntu/resolute/perception
 # Release: rolling
 
 ########################################
-# Distro: ubuntu:noble
+# Distro: ubuntu:resolute
 
 Tags: rolling-ros-core, rolling-ros-core-noble
 Architectures: amd64, arm64v8
 GitCommit: 8cf2903c0f8813aacd3042c71d4d2d56d5068ad5
-Directory: ros/rolling/ubuntu/noble/ros-core
+Directory: ros/rolling/ubuntu/resolute/ros-core
 
 Tags: rolling-ros-base, rolling-ros-base-noble, rolling
 Architectures: amd64, arm64v8
 GitCommit: 8cf2903c0f8813aacd3042c71d4d2d56d5068ad5
-Directory: ros/rolling/ubuntu/noble/ros-base
+Directory: ros/rolling/ubuntu/resolute/ros-base
 
 Tags: rolling-perception, rolling-perception-noble
 Architectures: amd64, arm64v8
 GitCommit: 8cf2903c0f8813aacd3042c71d4d2d56d5068ad5
-Directory: ros/rolling/ubuntu/noble/perception
+Directory: ros/rolling/ubuntu/resolute/perception
 

ros2/nightly/nightly/Dockerfile

@@ -1,5 +1,5 @@
 # multi-stage for setup
-FROM ubuntu:noble-20260410 AS setuper
+FROM ubuntu:resolute-20260421 AS setuper
 ARG DEBIAN_FRONTEND=noninteractive
 
 # setup timezone
@@ -48,7 +48,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 noble 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 resolute main" > /etc/apt/sources.list.d/ros2-testing.list
 
 # install bootstrap tools
 RUN apt-get update && apt-get install --no-install-recommends -y \