fix .travis.yml

.travis.yml

@@ -17,27 +17,28 @@ services:
   - docker
 env:
   global:
+    - ROSWS=wstool
+    - BUILDER=catkin
+    - USE_DOCKER=true
     - ROS_PARALLEL_JOBS="-j8 -l1"
     - CATKIN_PARALLEL_TEST_JOBS="-p1 -j8"
   matrix:
-    #- ROS_DISTRO=groovy ROSWS=rosws BUILDER=rosbuild USE_DEB=true
-    #- ROS_DISTRO=groovy ROSWS=rosws BUILDER=rosbuild USE_DEB=false
-    #- ROS_DISTRO=groovy ROSWS=wstool BUILDER=catkin USE_DEB=true
-    #- ROS_DISTRO=groovy ROSWS=wstool BUILDER=catkin USE_DEB=false
-    - USE_DOCKER=true USE_TRAVIS=true ROS_DISTRO=hydro ROSWS=wstool BUILDER=catkin USE_DEB=true
-    - USE_DOCKER=true USE_TRAVIS=true ROS_DISTRO=hydro ROSWS=wstool BUILDER=catkin USE_DEB=false NOT_TEST_INSTALL=true
-    - USE_DOCKER=true USE_TRAVIS=true ROS_DISTRO=indigo ROSWS=wstool BUILDER=catkin USE_DEB=true
-    - USE_DOCKER=true USE_TRAVIS=true ROS_DISTRO=indigo ROSWS=wstool BUILDER=catkin USE_DEB=false NOT_TEST_INSTALL=true
-    - USE_DOCKER=true USE_TRAVIS=true ROS_DISTRO=kinetic ROSWS=wstool BUILDER=catkin USE_DEB=true
-    - USE_DOCKER=true USE_TRAVIS=true ROS_DISTRO=kinetic ROSWS=wstool BUILDER=catkin USE_DEB=false NOT_TEST_INSTALL=true
-    - USE_DOCKER=true USE_TRAVIS=true ROS_DISTRO=melodic ROSWS=wstool BUILDER=catkin USE_DEB=true
-    - USE_JENKINS=true ROS_DISTRO=melodic ROSWS=wstool BUILDER=catkin USE_DEB=false NOT_TEST_INSTALL=true BEFORE_SCRIPT="pwd; sed -i \"35iadd_definitions(-Wno-deprecated)\" hrpsys/CMakeLists.txt; (cd hrpsys; git diff)"
+    - USE_TRAVIS=true ROS_DISTRO=hydro USE_DEB=true
+    - USE_TRAVIS=true ROS_DISTRO=hydro USE_DEB=false NOT_TEST_INSTALL=true
+    - USE_TRAVIS=true ROS_DISTRO=indigo USE_DEB=true
+    - USE_TRAVIS=true ROS_DISTRO=indigo USE_DEB=false NOT_TEST_INSTALL=true
+    - USE_TRAVIS=true ROS_DISTRO=kinetic USE_DEB=true
+    - USE_TRAVIS=true ROS_DISTRO=kinetic USE_DEB=false NOT_TEST_INSTALL=true
+    - USE_TRAVIS=true ROS_DISTRO=melodic USE_DEB=true
+    - USE_TRAVIS=true ROS_DISTRO=melodic USE_DEB=false NOT_TEST_INSTALL=true BEFORE_SCRIPT="pwd; sed -i \"35iadd_definitions(-Wno-deprecated)\" hrpsys/CMakeLists.txt; (cd hrpsys; git diff)"
 matrix:
   allow_failures:
     # if USE_DEB=false, testing time easily exceeds limits. Reduce the load on the host machine.
-    - env: USE_DOCKER=true USE_TRAVIS=true ROS_DISTRO=hydro ROSWS=wstool BUILDER=catkin USE_DEB=false NOT_TEST_INSTALL=true
-    - env: USE_DOCKER=true USE_TRAVIS=true ROS_DISTRO=indigo ROSWS=wstool BUILDER=catkin USE_DEB=false NOT_TEST_INSTALL=true
-    - env: USE_DOCKER=true USE_TRAVIS=true ROS_DISTRO=kinetic ROSWS=wstool BUILDER=catkin USE_DEB=false NOT_TEST_INSTALL=true
+    - env: USE_TRAVIS=true ROS_DISTRO=hydro USE_DEB=false NOT_TEST_INSTALL=true
+    - env: USE_TRAVIS=true ROS_DISTRO=indigo USE_DEB=false NOT_TEST_INSTALL=true
+    - env: USE_TRAVIS=true ROS_DISTRO=kinetic USE_DEB=false NOT_TEST_INSTALL=true
+    # hrpsys is not released completely on melodic
+    - env: USE_TRAVIS=true ROS_DISTRO=melodic USE_DEB=true
 before_install:
   # Install openrtm_aist & add osrf
   - add_scr="sudo apt-get install -qq -y ros-${ROS_DISTRO}-openrtm-aist; sudo -E sh -c \"echo \\\"deb http://packages.osrfoundation.org/gazebo/ubuntu-stable \`lsb_release -cs\` main\\\" > /etc/apt/sources.list.d/gazebo-latest.list\"; wget http://packages.osrfoundation.org/gazebo.key -O - | sudo apt-key add -; sudo apt-get update -qq"; if [ "${BEFORE_SCRIPT}" == "" ] ; then export BEFORE_SCRIPT=${add_scr}; else export BEFORE_SCRIPT="${BEFORE_SCRIPT}; ${add_scr}"; fi
@@ -55,6 +56,11 @@ before_install:
   - if [ "${ROS_DISTRO}" == "hydro" ] && [ "${USE_DEB}" != "true" ] ; then export BEFORE_SCRIPT="${BEFORE_SCRIPT}; wstool set -y robot_model --git https://github.com/pazeshun/robot_model.git -v for-hydro-with-new-pcre; wstool update"; export ROSDEP_ADDITIONAL_OPTIONS="-n -q -r --ignore-src --skip-keys=liburdfdom-dev --skip-keys=liburdfdom-headers-dev"; fi
   # On kinetic and melodic, drcsim is not released
   - if [ ${ROS_DISTRO} != "kinetic" ] && [ ${ROS_DISTRO} != "melodic" ] ; then export BEFORE_SCRIPT="${BEFORE_SCRIPT}; sudo apt-get install -qq -y drcsim"; fi
+  # Install libopencv-dev manually to compile hrpsys-simulator in hrpsys-base on kinetic
+  # Details: https://github.com/start-jsk/rtmros_common/pull/1091#issuecomment-611457804
+  #          https://github.com/start-jsk/rtmros_common/pull/1091#issuecomment-611476618
+  # Waiting for .travis.rosinstall.kinetic to use hrpsys-release
+  - if [ "${ROS_DISTRO}" == "kinetic" ] && [ "${USE_DEB}" != "true" ] ; then if [ "${EXTRA_DEB}" == "" ] ; then export EXTRA_DEB="libopencv-dev"; else export EXTRA_DEB="${EXTRA_DEB} libopencv-dev"; fi; fi
 script:
   - if [ "${ROS_DISTRO}" == "hydro" ] ; then sudo apt-get install -y --force-yes gdebi && wget https://bintray.com/artifact/download/furushchev/ros-shadow-fixed/python-catkin-tools_0.3.1-1_all.deb && wget https://bintray.com/artifact/download/furushchev/ros-shadow-fixed/python-catkin-pkg_0.2.10-1_all.deb && sudo gdebi -n -q python-catkin-pkg_0.2.10-1_all.deb && sudo gdebi -n -q python-catkin-tools_0.3.1-1_all.deb && sudo apt-mark hold python-catkin-tools; fi
   - source .travis/travis.sh