Merge remote-tracking branch 'origin/add-gazebo-namespace-skipping-in…

…dustrial' into add-gazebo-namespace-skipping-industrial

.github/workflows/industrial_ci.yaml

@@ -29,7 +29,7 @@ jobs:
     ros_industrial_ci:
         name: ROS Industrial CI
         runs-on: ubuntu-22.04
-        timeout-minutes: 60
+        timeout-minutes: 30
         needs:
             - black
             - spellcheck
@@ -64,7 +64,7 @@ jobs:
                   cp -r src/ros2_controllers/imu_sensor_broadcaster src/
                   rm -rf src/ros2_controllers
 
-            - name: Remove ign_ros2_control demo
+            - name: Remove ign_ros2_control demo and tests
               shell: bash
               run: rm -rf src/gazebosim/gz_ros2_control/ign_ros2_control_demos src/gazebosim/gz_ros2_control/gz_ros2_control_tests
 

rosbot/rosbot_hardware.repos

@@ -6,18 +6,18 @@ repositories:
   ros_components_description:
     type: git
     url: https://github.com/husarion/ros_components_description.git
-    version: gazebo-ignition-multirobots
+    version: ros2
   rosbot_controllers:
     type: git
     url: https://github.com/husarion/rosbot_controllers
-    version: update-params
+    version: main
   # Waiting for backporting to the humble version
   # https://github.com/ros-controls/ros2_controllers/pull/726 and
   # https://github.com/ros-controls/ros2_controllers/pull/831
   ros2_controllers:
     type: git
     url: https://github.com/delihus/ros2_controllers
-    version: imu-sensor-broadcaster-features
+    version: humble
   micro_ros_msgs:
     type: git
     url: https://github.com/micro-ROS/micro_ros_msgs.git

rosbot/rosbot_simulation.repos

@@ -7,4 +7,4 @@ repositories:
   husarion/husarion_office_gz:
     type: git
     url: https://github.com/husarion/husarion_office_gz
-    version: add-gazebo-plugins
+    version: main