Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable rolling / jammy CI (again) #1134

Merged
merged 7 commits into from
Mar 31, 2022
Merged

Enable rolling / jammy CI (again) #1134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
161618a
Enable rolling / jammy CI
Mar 22, 2022
0cfac8a
Merge branch 'main' into vatan/rolling/jammy_fix
Mar 26, 2022
a7a5e9b
Merge branch 'main' into vatan/rolling/jammy_fix
henningkayser Mar 29, 2022
c21ad3f
Use ros2_control binaries
Mar 30, 2022
17f7a58
Merge branch 'main' into vatan/rolling/jammy_fix
Mar 30, 2022
a77fae5
Use output screen instead of explicitly stating stderr
Mar 30, 2022
72471e0
Merge branch 'main' into vatan/rolling/jammy_fix
Mar 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,11 @@ jobs:
fail-fast: false
matrix:
env:
# - IMAGE: rolling-ci
# ROS_DISTRO: rolling
# - IMAGE: rolling-ci-testing
# ROS_DISTRO: rolling
- IMAGE: galactic-ci
- IMAGE: rolling-ci
CCOV: true
ROS_DISTRO: galactic
- IMAGE: galactic-ci-testing
ROS_DISTRO: galactic
ROS_DISTRO: rolling
- IMAGE: rolling-ci-testing
ROS_DISTRO: rolling
IKFAST_TEST: true
CLANG_TIDY: pedantic
env:
Expand Down
4 changes: 0 additions & 4 deletions moveit2.repos
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ repositories:
type: git
url: https://github.com/ros-planning/moveit_resources
version: ros2
ros2_control:
type: git
url: https://github.com/ros-controls/ros2_control.git
version: 2.1.0
ompl:
type: git
url: https://github.com/ompl/ompl.git
Expand Down
5 changes: 1 addition & 4 deletions moveit_planners/test_configs/prbt_moveit_config/launch/demo.launch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,10 +187,7 @@ def generate_launch_description():
package="controller_manager",
executable="ros2_control_node",
parameters=[robot_description, ros2_controllers_path],
output={
"stdout": "screen",
"stderr": "screen",
},
output="screen",
)

# Load controllers
Expand Down
5 changes: 1 addition & 4 deletions moveit_ros/hybrid_planning/test/launch/hybrid_planning_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,10 +187,7 @@ def generate_common_hybrid_launch_description():
package="controller_manager",
executable="ros2_control_node",
parameters=[robot_description, ros2_controllers_path],
output={
"stdout": "screen",
"stderr": "screen",
},
output="screen",
)

# Load controllers
Expand Down
5 changes: 1 addition & 4 deletions moveit_ros/moveit_servo/launch/pose_tracking_example.launch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,7 @@ def generate_launch_description():
package="controller_manager",
executable="ros2_control_node",
parameters=[moveit_config.robot_description, ros2_controllers_path],
output={
"stdout": "screen",
"stderr": "screen",
},
output="screen",
)

# Load controllers
Expand Down
10 changes: 2 additions & 8 deletions moveit_ros/moveit_servo/launch/servo_example.launch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,7 @@ def generate_launch_description():
package="controller_manager",
executable="ros2_control_node",
parameters=[robot_description, ros2_controllers_path],
output={
"stdout": "screen",
"stderr": "screen",
},
output="screen",
)

# Load controllers
Expand Down Expand Up @@ -147,10 +144,7 @@ def generate_launch_description():
robot_description,
robot_description_semantic,
],
output={
"stdout": "screen",
"stderr": "screen",
},
output="screen",
)

return LaunchDescription(
Expand Down
5 changes: 1 addition & 4 deletions moveit_ros/moveit_servo/test/launch/servo_launch_test_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,7 @@ def generate_servo_test_description(
package="controller_manager",
executable="ros2_control_node",
parameters=[moveit_config.robot_description, ros2_controllers_path],
output={
"stdout": "screen",
"stderr": "screen",
},
output="screen",
)

# Load controllers
Expand Down
5 changes: 1 addition & 4 deletions moveit_ros/moveit_servo/test/launch/test_servo_pose_tracking.test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,7 @@ def generate_servo_test_description(*args, gtest_name: SomeSubstitutionsType):
package="controller_manager",
executable="ros2_control_node",
parameters=[moveit_config.robot_description, ros2_controllers_path],
output={
"stdout": "screen",
"stderr": "screen",
},
output="screen",
)

# Load controllers
Expand Down
5 changes: 1 addition & 4 deletions moveit_ros/planning_interface/test/launch/move_group_launch_test_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,7 @@ def generate_move_group_test_description(*args, gtest_name: SomeSubstitutionsTyp
package="controller_manager",
executable="ros2_control_node",
parameters=[moveit_config.robot_description, ros2_controllers_path],
output={
"stdout": "screen",
"stderr": "screen",
},
output="screen",
)

# Load controllers
Expand Down