Update to ROS 2 Jazzy

eigendude · Jun 6, 2024 · 702c47f · 702c47f
1 parent c5f13af
commit 702c47f
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 6 deletions.
diff --git a/.github/workflows/ros.yml b/.github/workflows/ros.yml
@@ -27,7 +27,9 @@ jobs:
       matrix:
         include:
           - os: ubuntu-22.04
-            ros2_distro: iron
+            ros2_distro: jazzy
+          - os: ubuntu-24.04
+            ros2_distro: jazzy
           #- os: macbook
           #  ros2_distro: galactic
 

diff --git a/oasis_control/config/systemd/oasis_control.service b/oasis_control/config/systemd/oasis_control.service
@@ -17,7 +17,7 @@ User=garrett
 # ROS 2 configuration
 #
 
-Environment=ROS2_DISTRO=iron
+Environment=ROS2_DISTRO=jazzy
 Environment=RMW_IMPLEMENTATION=rmw_fastrtps_cpp
 
 #

diff --git a/oasis_drivers_py/config/systemd/oasis_drivers.service b/oasis_drivers_py/config/systemd/oasis_drivers.service
@@ -17,7 +17,7 @@ User=garrett
 # ROS 2 configuration
 #
 
-Environment=ROS2_DISTRO=iron
+Environment=ROS2_DISTRO=jazzy
 Environment=RMW_IMPLEMENTATION=rmw_fastrtps_cpp
 
 #

diff --git a/oasis_perception/config/systemd/oasis_perception.service b/oasis_perception/config/systemd/oasis_perception.service
@@ -17,7 +17,7 @@ User=garrett
 # ROS 2 configuration
 #
 
-Environment=ROS2_DISTRO=iron
+Environment=ROS2_DISTRO=jazzy
 Environment=RMW_IMPLEMENTATION=rmw_fastrtps_cpp
 
 #

diff --git a/oasis_tooling/scripts/depinstall_ros2_desktop.sh b/oasis_tooling/scripts/depinstall_ros2_desktop.sh
@@ -48,6 +48,12 @@ else
   CODENAME=
 fi
 
+#
+# Preconfigure license acceptance
+#
+
+echo "rti-connext-dds-6.0.1 rti-connext-dds-6.0.1/license-accepted select true" | sudo debconf-set-selections
+
 #
 # Setup ROS 2 sources
 #

diff --git a/oasis_tooling/scripts/env_ros2_desktop.sh b/oasis_tooling/scripts/env_ros2_desktop.sh
@@ -19,7 +19,7 @@ set -o nounset
 #
 
 # Define the ROS distro to use
-ROS2_DISTRO=iron
+ROS2_DISTRO=jazzy
 
 #
 # Environment paths and config

diff --git a/oasis_visualization/config/systemd/kodi_visualizer.service b/oasis_visualization/config/systemd/kodi_visualizer.service
@@ -19,7 +19,7 @@ Environment=XDG_RUNTIME_DIR=/run/user/1000
 # ROS 2 configuration
 #
 
-Environment=ROS2_DISTRO=iron
+Environment=ROS2_DISTRO=jazzy
 Environment=RMW_IMPLEMENTATION=rmw_fastrtps_cpp
 
 #