Merge pull request #748 from osrf/jazzy_main

[ROS] Jazzy use main apt repo
osrf · May 23, 2024 · 7d9aad0 · 7d9aad0
2 parents 0cbd0ef + 96528fa
commit 7d9aad0
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/.github/workflows/ros_ci.yaml b/.github/workflows/ros_ci.yaml
@@ -7,6 +7,7 @@ on:
     - '.ci/**'
     - '.github/workflows/ros_ci.yaml'
     # - 'ros/rolling/**'
+    - 'ros/jazzy/**'
     - 'ros/iron/**'
     - 'ros/humble/**'
     - 'ros/noetic/**'
@@ -15,6 +16,7 @@ on:
     - '.ci/**'
     - '.github/workflows/ros_ci.yaml'
     # - 'ros/rolling/**'
+    - 'ros/jazzy/**'
     - 'ros/iron/**'
     - 'ros/humble/**'
     - 'ros/noetic/**'
@@ -28,6 +30,7 @@ jobs:
       matrix:
         env:
           # - {HUB_REPO: ros, HUB_RELEASE: rolling, HUB_OS_NAME: ubuntu, HUB_OS_CODE_NAME: jammy}
+          - {HUB_REPO: ros, HUB_RELEASE: jazzy, HUB_OS_NAME: ubuntu, HUB_OS_CODE_NAME: noble}
           - {HUB_REPO: ros, HUB_RELEASE: iron, HUB_OS_NAME: ubuntu, HUB_OS_CODE_NAME: jammy}
           - {HUB_REPO: ros, HUB_RELEASE: humble, HUB_OS_NAME: ubuntu, HUB_OS_CODE_NAME: jammy}
           - {HUB_REPO: ros, HUB_RELEASE: noetic, HUB_OS_NAME: ubuntu, HUB_OS_CODE_NAME: focal}

diff --git a/ros/jazzy/ubuntu/noble/Makefile b/ros/jazzy/ubuntu/noble/Makefile
@@ -13,9 +13,9 @@ build:
 	@docker build --tag=ros:jazzy-ros-core-noble			ros-core/.
 	@docker build --tag=ros:jazzy-ros-base-noble			ros-base/.
 	@docker build --tag=ros:jazzy-perception-noble			perception/.
-	@docker build --tag=osrf/ros:jazzy-simulation-noble			simulation/.
-	@docker build --tag=osrf/ros:jazzy-desktop-noble			desktop/.
-	@docker build --tag=osrf/ros:jazzy-desktop-full-noble			desktop-full/.
+	# @docker build --tag=osrf/ros:jazzy-simulation-noble			simulation/.
+	# @docker build --tag=osrf/ros:jazzy-desktop-noble			desktop/.
+	# @docker build --tag=osrf/ros:jazzy-desktop-full-noble			desktop-full/.
 
 pull:
 	@docker pull ros:jazzy-ros-core-noble

diff --git a/ros/jazzy/ubuntu/noble/ros-core/Dockerfile b/ros/jazzy/ubuntu/noble/ros-core/Dockerfile
@@ -21,12 +21,12 @@ RUN set -eux; \
        export GNUPGHOME="$(mktemp -d)"; \
        gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
        mkdir -p /usr/share/keyrings; \
-       gpg --batch --export "$key" > /usr/share/keyrings/ros2-testing-archive-keyring.gpg; \
+       gpg --batch --export "$key" > /usr/share/keyrings/ros2-latest-archive-keyring.gpg; \
        gpgconf --kill all; \
        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-latest-archive-keyring.gpg ] http://packages.ros.org/ros2/ubuntu noble main" > /etc/apt/sources.list.d/ros2-latest.list
 
 # setup environment
 ENV LANG C.UTF-8

diff --git a/ros/manifest.yaml b/ros/manifest.yaml
@@ -569,7 +569,6 @@ release_names:
                                     - "$release_name-ros-base"
                                     - "$release_name-ros-base-$os_code_name"
                                     - "$release_name"
-                                    - latest
                             perception:
                                 aliases:
                                     - "$release_name-perception"
@@ -618,6 +617,7 @@ release_names:
                                     - "$release_name-ros-base"
                                     - "$release_name-ros-base-$os_code_name"
                                     - "$release_name"
+                                    - latest
                             perception:
                                 aliases:
                                     - "$release_name-perception"

diff --git a/ros/ros b/ros/ros
@@ -39,7 +39,7 @@ Architectures: amd64, arm64v8
 GitCommit: 27cc0b68263bbbb10bb58dd814efc0a6b0a01ec7
 Directory: ros/humble/ubuntu/jammy/ros-core
 
-Tags: humble-ros-base, humble-ros-base-jammy, humble, latest
+Tags: humble-ros-base, humble-ros-base-jammy, humble
 Architectures: amd64, arm64v8
 GitCommit: 20e3ba685bb353a3c00be9ba01c1b7a6823c9472
 Directory: ros/humble/ubuntu/jammy/ros-base
@@ -80,10 +80,10 @@ Directory: ros/iron/ubuntu/jammy/perception
 
 Tags: jazzy-ros-core, jazzy-ros-core-noble
 Architectures: amd64, arm64v8
-GitCommit: 0038f1c3a11aa0fc573d698b39ab5c204aad5a40
+GitCommit: 74e321bc1837c29f223a6d54895aa3c8eb184119
 Directory: ros/jazzy/ubuntu/noble/ros-core
 
-Tags: jazzy-ros-base, jazzy-ros-base-noble, jazzy
+Tags: jazzy-ros-base, jazzy-ros-base-noble, jazzy, latest
 Architectures: amd64, arm64v8
 GitCommit: 0038f1c3a11aa0fc573d698b39ab5c204aad5a40
 Directory: ros/jazzy/ubuntu/noble/ros-base