From 8f467c54e6a73f502d06ab707a096eae4479f571 Mon Sep 17 00:00:00 2001
From: "Isaac I.Y. Saito" <130s@2000.jukuin.keio.ac.jp>
Date: Thu, 6 Apr 2017 13:22:38 -0700
Subject: [PATCH] [CI] Add ROS Kinetic, Lunar.
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.
[test] Depend on rostest only during testing.
---
.travis.yml | 63 +++++++++++++++++++++++++-------------------------
CMakeLists.txt | 7 ++++--
package.xml | 4 +++-
3 files changed, 39 insertions(+), 35 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 47bbe37..4792612 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 646a2c3..67b3ec5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 2.8.3)
project(roswww)
-find_package(catkin REQUIRED rostest)
+find_package(catkin REQUIRED)
catkin_package()
catkin_python_setup()
@@ -12,4 +12,7 @@ install(DIRECTORY launch test www
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} USE_SOURCE_PERMISSIONS
)
-add_rostest(test/launch.test)
+if (CATKIN_ENABLE_TESTING)
+ find_package(rostest REQUIRED)
+ add_rostest(test/launch.test)
+endif()
diff --git a/package.xml b/package.xml
index 3c70c2c..6e08c9a 100644
--- a/package.xml
+++ b/package.xml
@@ -4,7 +4,7 @@
0.1.9
Feathery lightweight web server for ROS, that is based on Tornado web server module.
- Isaac Isao Saito
+ Isaac I.Y. Saito
Jonathan Mace
Jihoon Lee
BSD
@@ -15,8 +15,10 @@
catkin
python-catkin-pkg
rosbridge_server
+ rosbridge_server
rosgraph
rospack
+ python-requests
rostest