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.

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

Fix indigo test with .travis.rosinstall & add kinetic test #566

Merged
merged 6 commits into from
Jan 15, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 0 additions & 3 deletions .travis.rosinstall → .travis.rosinstall.indigo
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,3 @@
- git:
uri: https://github.com/start-jsk/rtmros_common
local-name: rtm-ros-robotics/rtmros_common
- git:
uri: https://github.com/start-jsk/rtmros_tutorials
local-name: rtm-ros-robotics/rtmros_tutorials
4 changes: 4 additions & 0 deletions .travis.rosinstall.kinetic
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Dependencies of hrpsys_gazebo_tutorials, but not released in kinetic
- git:
local-name: rtmros_gazebo
uri: https://github.com/start-jsk/rtmros_gazebo.git
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@ env:
matrix:
- ROS_DISTRO=indigo USE_DEB=true
- ROS_DISTRO=indigo USE_DEB=false NOT_TEST_INSTALL=true
- ROS_DISTRO=kinetic USE_DEB=false
matrix:
allow_failures:
- env: ROS_DISTRO=indigo USE_DEB=false NOT_TEST_INSTALL=true
# allow_failures:
# - env: ROS_DISTRO=indigo USE_DEB=false NOT_TEST_INSTALL=true
notifications:
email:
recipients:
Expand Down
5 changes: 4 additions & 1 deletion hrpsys_ros_bridge_tutorials/test/test_hrpsys_pa10.launch
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,14 @@
<arg name="GUI" default="false" />
<arg name="TIME_LIMIT" default="300"/>

<!-- See https://github.com/start-jsk/rtmros_common/issues/416#issuecomment-46846623 -->
<node name="start_omninames" pkg="rtmbuild" type="start_omninames.sh" args="2809" />

<include file="$(find hrpsys_ros_bridge_tutorials)/launch/pa10_startup.launch" >
<arg name="GUI" default="$(arg GUI)" />
<arg name="corbaport" default="2809" />
</include>

<test test-name="test_samplerobot_hrpsys" pkg="hrpsys_ros_bridge_tutorials" type="test_hrpsys.py" args="HRP1\(Robot\)0 9"
<test test-name="test_pa10_hrpsys" pkg="hrpsys_ros_bridge_tutorials" type="test_hrpsys.py" args="HRP1\(Robot\)0 9"
retry="4" />
</launch>