Skip to content

Commit 6374221

Browse files
authored
Do not install moveit dependencies (UniversalRobots#1671)
Since moveit_ros_visualization is currently broken upstream and we don't know when it will be back, remove it from the test pipeline for now. It is currently only an exec dependency for the moveit_config package. Explicitly skipping the rosdep key should make the CI for Rolling work again.
1 parent 68e634c commit 6374221

7 files changed

Lines changed: 60 additions & 17 deletions

.github/workflows/reusable_ici.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ on:
3434
default: '.ccache'
3535
required: false
3636
type: string
37+
rosdep_skip_keys:
38+
description: "Skip those keys when doing 'rosdep install'. space-separated list"
39+
default: ''
40+
required: false
41+
type: string
3742

3843
jobs:
3944
reusable_ici:
@@ -43,6 +48,7 @@ jobs:
4348
DOCKER_RUN_OPTS: '-v /var/run/docker.sock:/var/run/docker.sock --network ursim_net'
4449
CCACHE_DIR: ${{ github.workspace }}/${{ inputs.ccache_dir }}
4550
CACHE_PREFIX: ${{ inputs.ros_distro }}-${{ inputs.upstream_workspace }}-${{ inputs.ros_repo }}
51+
ROSDEP_SKIP_KEYS: ${{ inputs.rosdep_skip_keys }}
4652
steps:
4753
- name: Checkout ${{ github.ref_name }} since build is not scheduled
4854
if: ${{ github.event_name != 'schedule' }}

.github/workflows/rolling-binary-main.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,12 @@ jobs:
1818
ros_distro: rolling
1919
ros_repo: main
2020
ref_for_scheduled_build: main
21+
rosdep_skip_keys: >-
22+
moveit_configs_utils
23+
moveit_kinematics
24+
moveit_planners
25+
moveit_planners_chomp
26+
moveit_ros_move_group
27+
moveit_ros_visualization
28+
moveit_servo
29+
moveit_simple_controller_manager

.github/workflows/rolling-binary-testing.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,13 @@ jobs:
1818
ros_distro: rolling
1919
ros_repo: testing
2020
ref_for_scheduled_build: main
21+
rosdep_skip_keys: >-
22+
moveit_configs_utils
23+
moveit_kinematics
24+
moveit_planners
25+
moveit_planners_chomp
26+
moveit_ros_move_group
27+
moveit_ros_visualization
28+
moveit_servo
29+
moveit_simple_controller_manager
30+
warehouse_ros_sqlite

.github/workflows/rolling-semi-binary-main.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,12 @@ jobs:
1919
ros_repo: main
2020
upstream_workspace: Universal_Robots_ROS2_Driver.rolling.repos
2121
ref_for_scheduled_build: main
22+
rosdep_skip_keys: >-
23+
moveit_configs_utils
24+
moveit_kinematics
25+
moveit_planners
26+
moveit_planners_chomp
27+
moveit_ros_move_group
28+
moveit_ros_visualization
29+
moveit_servo
30+
moveit_simple_controller_manager

.github/workflows/rolling-semi-binary-testing.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,13 @@ jobs:
1919
ros_repo: testing
2020
upstream_workspace: Universal_Robots_ROS2_Driver.rolling.repos
2121
ref_for_scheduled_build: main
22+
rosdep_skip_keys: >-
23+
moveit_configs_utils
24+
moveit_kinematics
25+
moveit_planners
26+
moveit_planners_chomp
27+
moveit_ros_move_group
28+
moveit_ros_visualization
29+
moveit_servo
30+
moveit_simple_controller_manager
31+
warehouse_ros_sqlite

Universal_Robots_ROS2_Driver.rolling.repos

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,19 @@ repositories:
3535
type: git
3636
url: https://github.com/ros-controls/realtime_tools.git
3737
version: master
38-
moveit2:
39-
type: git
40-
url: https://github.com/moveit/moveit2.git
41-
version: main
42-
moveit_msgs:
43-
type: git
44-
url: https://github.com/moveit/moveit_msgs.git
45-
version: ros2
46-
srdfdom:
47-
type: git
48-
url: https://github.com/moveit/srdfdom.git
49-
version: ros2
50-
moveit_resources:
51-
type: git
52-
url: https://github.com/moveit/moveit_resources.git
53-
version: ros2
38+
# moveit2:
39+
# type: git
40+
# url: https://github.com/moveit/moveit2.git
41+
# version: main
42+
# moveit_msgs:
43+
# type: git
44+
# url: https://github.com/moveit/moveit_msgs.git
45+
# version: ros2
46+
# srdfdom:
47+
# type: git
48+
# url: https://github.com/moveit/srdfdom.git
49+
# version: ros2
50+
# moveit_resources:
51+
# type: git
52+
# url: https://github.com/moveit/moveit_resources.git
53+
# version: ros2

ur_controllers/package.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747

4848
<test_depend>controller_manager</test_depend>
4949
<test_depend>ros2_control_test_assets</test_depend>
50-
<test_depend>hardware_interface_testing</test_depend>
5150

5251
<export>
5352
<build_type>ament_cmake</build_type>

0 commit comments

Comments
 (0)