default to jazzy

fred-labs · fred-labs · commit d452905aeb3d · 2025-01-03T03:55:11.000+01:00
diff --git a/.github/workflows/Dockerfile b/.github/workflows/Dockerfile
@@ -1,4 +1,4 @@
-ARG ROS_DISTRO=humble
+ARG ROS_DISTRO=jazzy
 
 FROM osrf/ros:${ROS_DISTRO}-desktop-full
 SHELL ["/bin/bash", "-xo", "pipefail", "-c"]
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -13,7 +13,7 @@ jobs:
     name: Analyze (${{ matrix.language }})
     runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
     container:
-      image:  osrf/ros:humble-desktop-full
+      image:  osrf/ros:jazzy-desktop-full
     timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
     permissions:
       # required for all workflows
@@ -47,12 +47,12 @@ jobs:
     - if: matrix.build-mode == 'manual'
       shell: bash
       run: |
-        source /opt/ros/humble/setup.bash
+        source /opt/ros/jazzy/setup.bash
         colcon build --packages-up-to scenario_execution_interfaces
         source install/setup.bash
         apt update
-        rosdep update --rosdistro=humble
-        rosdep install --rosdistro=humble --from-paths scenario_execution_rviz --ignore-src -r -y;
+        rosdep update --rosdistro=jazzy
+        rosdep install --rosdistro=jazzy --from-paths scenario_execution_rviz --ignore-src -r -y;
         mkdir build_rviz
         cd build_rviz
         cmake ../scenario_execution_rviz
diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml
@@ -47,7 +47,7 @@ jobs:
         push: true
         tags: ghcr.io/cps-test-lab/scenario-execution:${{ github.event.pull_request.base.ref || steps.extract_branch.outputs.branch }}
         build-args: |
-          ROS_DISTRO=${{ github.ref == 'refs/heads/main' && 'humble' || github.event.pull_request.base.ref == 'main' && 'humble' || github.event.pull_request.base.ref }}
+          ROS_DISTRO=${{ github.ref == 'refs/heads/main' && 'jazzy' || github.event.pull_request.base.ref == 'main' && 'jazzy' || github.event.pull_request.base.ref }}
   test-devcontainer:
     runs-on: ubuntu-latest
     permissions:
@@ -68,4 +68,4 @@ jobs:
         file: .devcontainer/Dockerfile
         push: false
         build-args: |
-          ROS_DISTRO=${{ github.ref == 'refs/heads/main' && 'humble' || github.event.pull_request.base.ref == 'main' && 'humble' || github.event.pull_request.base.ref }}
+          ROS_DISTRO=${{ github.ref == 'refs/heads/main' && 'jazzy' || github.event.pull_request.base.ref == 'main' && 'jazzy' || github.event.pull_request.base.ref }}
diff --git a/.github/workflows/test_build.yml b/.github/workflows/test_build.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Build
         shell: bash
         run: |
-          source /opt/ros/${{ github.event.pull_request.base.ref == 'main' && 'humble' || github.event.pull_request.base.ref }}/setup.bash
+          source /opt/ros/${{ github.event.pull_request.base.ref == 'main' && 'jazzy' || github.event.pull_request.base.ref }}/setup.bash
           git clone https://github.com/ros-navigation/nav2_minimal_turtlebot_simulation.git
           cd nav2_minimal_turtlebot_simulation
           git checkout f4eefd049359b3f0becabd7a0870005f4140ec08
@@ -55,7 +55,7 @@ jobs:
       - name: Test
         shell: bash
         run: |
-          source /opt/ros/${{ github.event.pull_request.base.ref == 'main' && 'humble' || github.event.pull_request.base.ref }}/setup.bash
+          source /opt/ros/${{ github.event.pull_request.base.ref == 'main' && 'jazzy' || github.event.pull_request.base.ref }}/setup.bash
           source install/setup.bash
           export -n CYCLONEDDS_URI
           export ROS_DOMAIN_ID=2
@@ -92,7 +92,7 @@ jobs:
       - name: Test
         shell: bash
         run: |
-          source /opt/ros/${{ github.event.pull_request.base.ref == 'main' && 'humble' || github.event.pull_request.base.ref }}/setup.bash
+          source /opt/ros/${{ github.event.pull_request.base.ref == 'main' && 'jazzy' || github.event.pull_request.base.ref }}/setup.bash
           source install/setup.bash
           export -n CYCLONEDDS_URI
           export ROS_DOMAIN_ID=2
@@ -127,7 +127,7 @@ jobs:
       - name: Test Scenario Files
         shell: bash
         run: |
-          source /opt/ros/${{ github.event.pull_request.base.ref == 'main' && 'humble' || github.event.pull_request.base.ref }}/setup.bash
+          source /opt/ros/${{ github.event.pull_request.base.ref == 'main' && 'jazzy' || github.event.pull_request.base.ref }}/setup.bash
           source install/setup.bash
           find . -name "*.osc" | grep -Ev "lib_osc/*|examples/example_scenario_variation|scenario_execution_coverage|fail*|install|build" | while read -r file; do 
             echo "$file"; 
@@ -150,7 +150,7 @@ jobs:
       - name: Test Example Scenario
         shell: bash
         run: |
-          source /opt/ros/${{ github.event.pull_request.base.ref == 'main' && 'humble' || github.event.pull_request.base.ref }}/setup.bash
+          source /opt/ros/${{ github.event.pull_request.base.ref == 'main' && 'jazzy' || github.event.pull_request.base.ref }}/setup.bash
           source install/setup.bash
           #shellcheck disable=SC1083
           scenario_batch_execution -i examples/example_scenario/ -o test_example_scenario --ignore-process-return-value -- ros2 launch scenario_execution_ros scenario_launch.py scenario:={SCENARIO} output_dir:={OUTPUT_DIR}
@@ -177,7 +177,7 @@ jobs:
       - name: Test Example Library
         shell: bash
         run: |
-          source /opt/ros/${{ github.event.pull_request.base.ref == 'main' && 'humble' || github.event.pull_request.base.ref }}/setup.bash
+          source /opt/ros/${{ github.event.pull_request.base.ref == 'main' && 'jazzy' || github.event.pull_request.base.ref }}/setup.bash
           source install/setup.bash
           # shellcheck disable=SC1083
           scenario_batch_execution -i examples/example_library/scenarios -o test_example_library --ignore-process-return-value -- ros2 launch scenario_execution_ros scenario_launch.py scenario:={SCENARIO} output_dir:={OUTPUT_DIR}
@@ -204,7 +204,7 @@ jobs:
       - name: Test Example Variation
         shell: bash
         run: |
-          source /opt/ros/${{ github.event.pull_request.base.ref == 'main' && 'humble' || github.event.pull_request.base.ref }}/setup.bash
+          source /opt/ros/${{ github.event.pull_request.base.ref == 'main' && 'jazzy' || github.event.pull_request.base.ref }}/setup.bash
           source install/setup.bash
           scenario_variation -o scenario_variation_out examples/example_scenario_variation/example_scenario_variation.osc
           # shellcheck disable=SC1083
@@ -232,7 +232,7 @@ jobs:
       - name: Test Example Nav2
         shell: bash
         run: |
-          source /opt/ros/${{ github.event.pull_request.base.ref == 'main' && 'humble' || github.event.pull_request.base.ref }}/setup.bash
+          source /opt/ros/${{ github.event.pull_request.base.ref == 'main' && 'jazzy' || github.event.pull_request.base.ref }}/setup.bash
           source install/setup.bash
           Xvfb :1 -screen 0 800x600x16 &
           export DISPLAY=:1.0
@@ -265,7 +265,7 @@ jobs:
       - name: Test Example Simulation
         shell: bash
         run: |
-          source /opt/ros/${{ github.event.pull_request.base.ref == 'main' && 'humble' || github.event.pull_request.base.ref }}/setup.bash
+          source /opt/ros/${{ github.event.pull_request.base.ref == 'main' && 'jazzy' || github.event.pull_request.base.ref }}/setup.bash
           source install/setup.bash
           Xvfb :1 -screen 0 800x600x16 &
           export DISPLAY=:1.0
@@ -298,7 +298,7 @@ jobs:
       - name: Test Example Multirobot
         shell: bash
         run: |
-          source /opt/ros/${{ github.event.pull_request.base.ref == 'main' && 'humble' || github.event.pull_request.base.ref }}/setup.bash
+          source /opt/ros/${{ github.event.pull_request.base.ref == 'main' && 'jazzy' || github.event.pull_request.base.ref }}/setup.bash
           source install/setup.bash
           Xvfb :1 -screen 0 800x600x16 &
           export DISPLAY=:1.0
@@ -318,7 +318,7 @@ jobs:
         if: always()
         shell: bash
         run: |
-          source /opt/ros/${{ github.event.pull_request.base.ref == 'main' && 'humble' || github.event.pull_request.base.ref }}/setup.bash
+          source /opt/ros/${{ github.event.pull_request.base.ref == 'main' && 'jazzy' || github.event.pull_request.base.ref }}/setup.bash
           source /rosbag2_to_video/install/setup.bash
           ros2 bag to_video  -t /static_camera/image_raw -o test_example_multirobot/example_multi_robot/example-multi-robot.mp4  test_example_multirobot/example_multi_robot/rosbag2_* --fps 5 --codec mp4v
       - name: Upload video
@@ -350,7 +350,7 @@ jobs:
       - name: Test Example External Method
         shell: bash
         run: |
-          source /opt/ros/${{ github.event.pull_request.base.ref == 'main' && 'humble' || github.event.pull_request.base.ref }}/setup.bash
+          source /opt/ros/${{ github.event.pull_request.base.ref == 'main' && 'jazzy' || github.event.pull_request.base.ref }}/setup.bash
           source install/setup.bash
           export -n CYCLONEDDS_URI
           export ROS_DOMAIN_ID=2
@@ -379,7 +379,7 @@ jobs:
       - name: Test Example Moveit2
         shell: bash
         run: |
-          source /opt/ros/${{ github.event.pull_request.base.ref == 'main' && 'humble' || github.event.pull_request.base.ref }}/setup.bash
+          source /opt/ros/${{ github.event.pull_request.base.ref == 'main' && 'jazzy' || github.event.pull_request.base.ref }}/setup.bash
           source install/setup.bash
           Xvfb :1 -screen 0 800x600x16 &
           export DISPLAY=:1.0
@@ -413,7 +413,7 @@ jobs:
       - name: Test Scenario Execution Gazebo
         shell: bash
         run: |
-          source /opt/ros/${{ github.event.pull_request.base.ref == 'main' && 'humble' || github.event.pull_request.base.ref }}/setup.bash
+          source /opt/ros/${{ github.event.pull_request.base.ref == 'main' && 'jazzy' || github.event.pull_request.base.ref }}/setup.bash
           source install/setup.bash
           Xvfb :1 -screen 0 800x600x16 &
           export DISPLAY=:1.0
@@ -446,7 +446,7 @@ jobs:
       - name: Test Scenario Execution Nav2
         shell: bash
         run: |
-          source /opt/ros/${{ github.event.pull_request.base.ref == 'main' && 'humble' || github.event.pull_request.base.ref }}/setup.bash
+          source /opt/ros/${{ github.event.pull_request.base.ref == 'main' && 'jazzy' || github.event.pull_request.base.ref }}/setup.bash
           source install/setup.bash
           Xvfb :1 -screen 0 800x600x16 &
           export DISPLAY=:1.0
@@ -465,7 +465,7 @@ jobs:
         if: always()
         shell: bash
         run: |
-          source /opt/ros/${{ github.event.pull_request.base.ref == 'main' && 'humble' || github.event.pull_request.base.ref }}/setup.bash
+          source /opt/ros/${{ github.event.pull_request.base.ref == 'main' && 'jazzy' || github.event.pull_request.base.ref }}/setup.bash
           source /rosbag2_to_video/install/setup.bash
           ros2 bag to_video  -t /static_camera/image_raw -o test_scenario_execution_nav2/test_scenario_execution_nav2/example_nav2.mp4  test_scenario_execution_nav2/test_scenario_execution_nav2/rosbag2_* --fps 5 --codec mp4v
       - name: Upload video
@@ -492,7 +492,7 @@ jobs:
       - name: Test Scenario Execution PyBullet
         shell: bash
         run: |
-          source /opt/ros/${{ github.event.pull_request.base.ref == 'main' && 'humble' || github.event.pull_request.base.ref }}/setup.bash
+          source /opt/ros/${{ github.event.pull_request.base.ref == 'main' && 'jazzy' || github.event.pull_request.base.ref }}/setup.bash
           source install/setup.bash
           Xvfb :1 -screen 0 800x600x16 &
           export DISPLAY=:1.0
@@ -522,7 +522,7 @@ jobs:
       - name: Test Scenario Execution X11
         shell: bash
         run: |
-          source /opt/ros/${{ github.event.pull_request.base.ref == 'main' && 'humble' || github.event.pull_request.base.ref }}/setup.bash
+          source /opt/ros/${{ github.event.pull_request.base.ref == 'main' && 'jazzy' || github.event.pull_request.base.ref }}/setup.bash
           source install/setup.bash
           sudo apt -y install mesa-utils
           Xvfb :1 -screen 0 800x600x16 &
diff --git a/docs/development.rst b/docs/development.rst
@@ -63,7 +63,7 @@ Create an `.env` file by executing:
 
 .. code-block:: bash
 
-   source /opt/ros/humble/setup.bash
+   source /opt/ros/jazzy/setup.bash
    source install/setup.bash
    echo PYTHONPATH=$PYTHONPATH > .env
    echo HOME=$HOME >> .env
diff --git a/libs/scenario_execution_floorplan_dsl/README.md b/libs/scenario_execution_floorplan_dsl/README.md
@@ -16,7 +16,7 @@ git checkout 34bd70bc89b285173226e27add6f4f5589de106a
 docker build . --tag floorplan:latest
 
 # build scenario execution and dependencies
-source /opt/ros/humble/setup.bash
+source /opt/ros/jazzy/setup.bash
 colcon build --packages-up-to scenario_execution_floorplan_dsl scenario_execution_ros scenario_execution_gazebo scenario_execution_nav2 tb4_sim_scenario
 source install/setup.bash
 ```

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-ARG ROS_DISTRO=humble`
	`1`	`+ARG ROS_DISTRO=jazzy`
`2`	`2`
`3`	`3`	`FROM osrf/ros:${ROS_DISTRO}-desktop-full`
`4`	`4`	`SHELL ["/bin/bash", "-xo", "pipefail", "-c"]`