update travis

.travis.rosinstall

@@ -1,18 +1,16 @@
-- git:
-    local-name: jsk-ros-pkg/jsk_common
-    uri: https://github.com/jsk-ros-pkg/jsk_common.git
-    version: master
-- git:
-    local-name: jsk-ros-pkg/jsk_robot
-    uri: https://github.com/jsk-ros-pkg/jsk_robot.git
-    version: master
+# - git:
+#     local-name: jsk-ros-pkg/jsk_robot
+#     uri: https://github.com/jsk-ros-pkg/jsk_robot.git
+#     version: c978f3da06261c77e0dafea2f2e4df072323b555
 - git:
     local-name: FA-I-sensor/force_proximity_ros
     uri: https://github.com/knorth55/FA-I-sensor.git
     version: jsk_apc
-
-# waiting for release of https://github.com/jsk-ros-pkg/jsk_recognition/pull/2118
 - git:
-    local-name: jsk-ros-pkg/jsk_recognition
-    uri: https://github.com/jsk-ros-pkg/jsk_recognition.git
-    version: 4320a60bc06e324c98bc92ed9a9f90491e4d5e5e
+    local-name: FOR_SIMULATION/baxter_common
+    uri: https://github.com/knorth55/baxter_common.git
+    version: jsk_apc
+# - git:
+#     local-name: jsk-ros-pkg/jsk_recognition
+#     uri: https://github.com/jsk-ros-pkg/jsk_recognition.git
+#     version: d774854420af82fe9ea16319d743a2b465d63d78

.travis.yml

@@ -2,35 +2,32 @@ sudo: required
 
 dist: trusty
 
-language: generic
+language: c++ # to avoid using /opt/python from travis
 
-cache:
-  directories:
-    - $HOME/.ccache
-    - $HOME/.cache/pip
-    - $HOME/.ros/data
+# cache:
+#   directories:
+#     - $HOME/.ccache
+#     - $HOME/.cache/pip
+#     - $HOME/.ros/data
 
 env:
   global:
-    - CATKIN_TOOLS_CONFIG_OPTIONS="--blacklist jsk_perception jsk_pcl_ros_utils jsk_pcl_ros resized_image_transport"
+    - CATKIN_TOOLS_CONFIG_OPTIONS="--blacklist imagesift jsk_recognition_msgs jsk_perception jsk_pcl_ros_utils jsk_pcl_ros resized_image_transport checkerboard_detector fetcheus naoqieus jsk_fetch_startup jsk_nao_startup roseus_remote jsk_robot_startup jsk_robot_utils jsk_pr2_calibration pr2_base_trajectory_action jsk_baxter_web peppereus naoeus jsk_baxter_desktop jsk_pepper_startup jsk_pr2_startup jsk_pr2_desktop"
     - NOT_TEST_INSTALL=true
-    - ROS_PARALLEL_JOBS="-j2"
+    - ROS_PARALLEL_JOBS="-j4"
     - ROSDEP_ADDITIONAL_OPTIONS="-n -q --ignore-src --skip-keys=jsk_smart_gui --skip-keys=ros3djs --skip-keys=pr2_calibration_launch --skip-keys=jsk_android_gui_api9 --skip-keys=ros2djs --skip-keys=face_recognition --skip-keys=roslibjs --skip-keys=force_proximity_ros --skip-keys=safe_teleop_base"
     - USE_DEB=false
-    - USE_TRAVIS=true
+    - NUMBER_OF_LOGS_TO_KEEP=10 # default is 3
+    # - USE_TRAVIS=true
+    - DOCKER_IMAGE_JENKINS="jsk-apc-indigo"  # built on Jenkins
   matrix:
     - ROS_DISTRO=indigo
 
-install:
-  - git clone https://github.com/jsk-ros-pkg/jsk_travis.git .travis
-  - (cd .travis && git checkout 40640d45c709bdc7d74a1f8983d51d5df553dbc1)
-
 script:
   # build & test ROS packages
   - source .travis/travis.sh
   # build doc
   - cd $TRAVIS_BUILD_DIR/doc
-  - unset PYTHONPATH  # cleanup for virtualenv
   - source setup.sh
   - make html