Skip to content

Commit

Permalink
[CI] Add ROS Kinetic, Lunar.
Browse files Browse the repository at this point in the history
Add missing dependency for test for Xenial. Hope this won't regression for previous distros. Seems to be that `rosdep` [keys](https://github.com/ros/rosdistro/blob/842dcd1ecd25024bfd69401513580f42e5e1b58a/rosdep/python.yaml#L2170) for `python-requests` has been there since Lucid.

Update maintainer.

[CI] Allow-failure ROS  Lunar since dependency isn't met yet.
  • Loading branch information
130s committed Apr 6, 2017
1 parent 2f9663b commit 72d650d
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 33 deletions.
63 changes: 31 additions & 32 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,41 +1,40 @@
# This config file for Travis CI utilizes ros-industrial/industrial_ci package.
# For more info for the package, see https://github.com/ros-industrial/industrial_ci/blob/master/README.rst
sudo: required
dist: trusty
services:
- docker
language: generic
compiler:
- gcc
notifications:
email:
recipients:
- gm130s@gmail.com
env:
matrix:
- USE_DEB=true ROS_DISTRO="indigo" REPOSITORY=http://packages.ros.org/ros/ubuntu
- USE_DEB=true ROS_DISTRO="indigo" REPOSITORY=http://packages.ros.org/ros-shadow-fixed/ubuntu
- ROS_DISTRO="indigo" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
- ROS_DISTRO="indigo" ROS_REPOSITORY_PATH=http://packages.ros.org/ros-shadow-fixed/ubuntu
- ROS_DISTRO="indigo" PRERELEASE=true
- ROS_DISTRO="jade" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
- ROS_DISTRO="jade" ROS_REPOSITORY_PATH=http://packages.ros.org/ros-shadow-fixed/ubuntu
- ROS_DISTRO="jade" PRERELEASE=true
- ROS_DISTRO="kinetic" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
- ROS_DISTRO="kinetic" ROS_REPOSITORY_PATH=http://packages.ros.org/ros-shadow-fixed/ubuntu
- ROS_DISTRO="kinetic" PRERELEASE=true
- ROS_DISTRO="lunar" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
- ROS_DISTRO="lunar" ROS_REPOSITORY_PATH=http://packages.ros.org/ros-shadow-fixed/ubuntu
- ROS_DISTRO="lunar" PRERELEASE=true
matrix:
allow_failures:
- env: USE_DEB=true ROS_DISTRO="jade" REPOSITORY=http://packages.ros.org/ros/ubuntu
- env: USE_DEB=true ROS_DISTRO="jade" REPOSITORY=http://packages.ros.org/ros-shadow-fixed/ubuntu
- env: ROS_DISTRO="indigo" PRERELEASE=true # Run docker-based ROS prerelease test http://wiki.ros.org/bloom/Tutorials/PrereleaseTest Because we might not want to run prerelease test for all PRs, it's omitted from pass-fail criteria.
- env: ROS_DISTRO="jade" PRERELEASE=true
- env: ROS_DISTRO="kinetic" PRERELEASE=true
- env: ROS_DISTRO="lunar" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
- env: ROS_DISTRO="lunar" ROS_REPOSITORY_PATH=http://packages.ros.org/ros-shadow-fixed/ubuntu
- env: ROS_DISTRO="lunar" PRERELEASE=true
install:
- export CI_SOURCE_PATH=$(pwd)
- export REPOSITORY_NAME=${PWD##*/}
- echo "Testing branch $TRAVIS_BRANCH of $REPOSITORY_NAME"
- sudo sh -c "echo \"deb ${REPOSITORY} `lsb_release -cs` main\" > /etc/apt/sources.list.d/ros-latest.list"
- wget http://packages.ros.org/ros.key -O - | sudo apt-key add -
- sudo apt-get update -qq
- sudo apt-get install -qq -y python-rosdep python-catkin-tools ros-${ROS_DISTRO}-catkin
- sudo rosdep init
- rosdep update
- git clone https://github.com/ros-industrial/industrial_ci.git .ci_config
script:
- mkdir -p ~/catkin_ws/src
- cd ~/catkin_ws
- ln -sf ${CI_SOURCE_PATH} src/${REPOSITORY_NAME}
- if [ "${USE_DEB}" == false ] ; then git clone https://github.com/start-jsk/open_industrial_ros_controllers src/open_industrial_ros_controllers; fi
- rosdep install --from-paths src -y --ignore-src --rosdistro ${ROS_DISTRO}
- source /opt/ros/${ROS_DISTRO}/setup.bash
- env | grep ROS
## INSTALL
# Enable install space
- catkin config --install
# Build [and Install] packages
- catkin build --limit-status-rate 0.1 --no-notify -DCMAKE_BUILD_TYPE=Release
# Build tests
- catkin build --limit-status-rate 0.1 --no-notify --make-args tests
- source install/setup.bash
# Run tests
- catkin run_tests
# check test (this only works on indigo onward)
- catkin_test_results build
- .ci_config/travis.sh
# - source ./travis.sh # Enable this when you have a package-local script
4 changes: 3 additions & 1 deletion package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<version>0.1.9</version>
<description>Feathery lightweight web server for ROS, that is based on <a href = "http://www.tornadoweb.org/en/stable">Tornado</a> web server module.</description>

<maintainer email="iisaito@opensource-robotics.tokyo.jp">Isaac Isao Saito</maintainer>
<maintainer email="iisaito@kinugarage.com">Isaac I.Y. Saito</maintainer>
<author>Jonathan Mace</author>
<author email="jihoonl@yujinrobot.com">Jihoon Lee</author>
<license>BSD</license>
Expand All @@ -15,8 +15,10 @@
<buildtool_depend>catkin</buildtool_depend>
<build_depend>python-catkin-pkg</build_depend>
<run_depend>rosbridge_server</run_depend>
<run_depend>rosbridge_server</run_depend>
<run_depend>rosgraph</run_depend>
<run_depend>rospack</run_depend>
<test_depend>python-requests</test_depend>
<test_depend>rostest</test_depend>
<export>
<rosdoc config="rosdoc.yaml" />
Expand Down

0 comments on commit 72d650d

Please sign in to comment.