Merge pull request start-jsk#717 from k-okada/use_prallel_jobs_1

[.travis,.travis.yml] use latest travis and set PARALLEJ_JOBS for test as 1

.travis.yml

@@ -10,16 +10,23 @@ python:
 compiler:
   - gcc
 env:
-  - ROS_DISTRO=hydro  ROSWS=wstool BUILDER=catkin    USE_DEB=true    CATKIN_PARALLEL_JOBS='-p2'
-  - ROS_DISTRO=hydro  ROSWS=wstool BUILDER=catkin    USE_DEB=false   NOT_TEST_INSTALL=true CATKIN_PARALLEL_JOBS='-p2'
-  - ROS_DISTRO=hydro  ROSWS=wstool BUILDER=catkin    USE_DEB=true    NOT_TEST_INSTALL=true CATKIN_PARALLEL_JOBS='-p2' INSTALL_SRC="http://github.com/start-jsk/rtmros_tutorials" TEST_PKGS="hrpsys_ros_bridge_tutorials"
-  - ROS_DISTRO=hydro  ROSWS=wstool BUILDER=catkin    USE_DEB=source  NOT_TEST_INSTALL=true CATKIN_PARALLEL_JOBS='-p2'
-  - ROS_DISTRO=indigo ROSWS=wstool BUILDER=catkin    USE_DEB=true
-  - TEST_TYPE=work_with_downstream  TEST_PACKAGE=hironx-ros-bridge ROS_DISTRO=hydro EXTRA_DEB="ros-hydro-roslint ros-hydro-robot-pose-ekf"
-  - TEST_TYPE=work_with_315_1_10    TEST_PACKAGE=hironx-ros-bridge ROS_DISTRO=hydro EXTRA_DEB=ros-hydro-roslint
+  global:
+    - ROSWS=wstool
+    - BUILDER=catkin
+    - CATKIN_PARALLEL_JOBS='-p2'
+    - CATKIN_PARALLEL_TEST_JOBS='-p1'
+    - ROS_PARALLEL_TEST_JOBS='-j1'
+  matrix:
+    - ROS_DISTRO=hydro  USE_DEB=true
+    - ROS_DISTRO=hydro  USE_DEB=false   NOT_TEST_INSTALL=true
+    - ROS_DISTRO=hydro  USE_DEB=true    NOT_TEST_INSTALL=true INSTALL_SRC="http://github.com/start-jsk/rtmros_tutorials" TEST_PKGS="hrpsys_ros_bridge_tutorials"
+    - ROS_DISTRO=hydro  USE_DEB=source  NOT_TEST_INSTALL=true
+    - ROS_DISTRO=indigo USE_DEB=true
+    - TEST_TYPE=work_with_downstream  TEST_PACKAGE=hironx-ros-bridge ROS_DISTRO=hydro EXTRA_DEB="ros-hydro-roslint ros-hydro-robot-pose-ekf"
+    - TEST_TYPE=work_with_315_1_10    TEST_PACKAGE=hironx-ros-bridge ROS_DISTRO=hydro EXTRA_DEB=ros-hydro-roslint
 matrix:
   allow_failures:
-  - env: ROS_DISTRO=indigo ROSWS=wstool BUILDER=catkin    USE_DEB=true
+  - env: ROS_DISTRO=indigo USE_DEB=true
 notifications:
   email:
     recipients: