Merge pull request #1750 from wkentaro/hotfix-travis

Hotfix to make Travis testing pass

.travis.rosinstall

@@ -1,7 +1,7 @@
 - git:
     uri: https://github.com/jsk-ros-pkg/jsk_common.git
     local-name: jsk-ros-pkg/jsk_common
-    version: master
+    version: 2.0.16
 # - git:
 #     uri: https://github.com/jsk-ros-pkg/jsk_roseus.git
 #     local-name: jsk-ros-pkg/jsk_roseus

.travis.yml

@@ -18,14 +18,14 @@ env:
     - USE_JENKINS=true
   matrix:
     - ROS_DISTRO=hydro  USE_DEB=false CATKIN_TOOLS_BUILD_OPTIONS="-iv --summarize --no-status --no-color"
-    - ROS_DISTRO=indigo USE_DEB=true NUMBER_OF_LOGS=12
-    - ROS_DISTRO=indigo USE_DEB=true BEFORE_SCRIPT='$CI_SOURCE_PATH/.travis_before_script_released_testing.bash' ROS_REPOSITORY_PATH="http://packages.ros.org/ros/ubuntu" NUMBER_OF_LOGS=12
-    - ROS_DISTRO=indigo USE_DEB=true BEFORE_SCRIPT='$CI_SOURCE_PATH/.travis_before_script_opencv3.bash' NUMBER_OF_LOGS=12
-    - ROS_DISTRO=indigo USE_DEB=true BEFORE_SCRIPT='$CI_SOURCE_PATH/.travis_before_script_pcl1.8.bash' NUMBER_OF_LOGS=12
+    - ROS_DISTRO=indigo USE_DEB=false NUMBER_OF_LOGS=12
+    - ROS_DISTRO=indigo USE_DEB=false BEFORE_SCRIPT='$CI_SOURCE_PATH/.travis_before_script_released_testing.bash' ROS_REPOSITORY_PATH="http://packages.ros.org/ros/ubuntu" NUMBER_OF_LOGS=12
+    - ROS_DISTRO=indigo USE_DEB=false BEFORE_SCRIPT='$CI_SOURCE_PATH/.travis_before_script_opencv3.bash' NUMBER_OF_LOGS=12
+    - ROS_DISTRO=indigo USE_DEB=false BEFORE_SCRIPT='$CI_SOURCE_PATH/.travis_before_script_pcl1.8.bash' NUMBER_OF_LOGS=12
     - ROS_DISTRO=jade   USE_DEB=false
 matrix:
   allow_failures:
-    - env: ROS_DISTRO=indigo USE_DEB=true BEFORE_SCRIPT='$CI_SOURCE_PATH/.travis_before_script_opencv3.bash' NUMBER_OF_LOGS=12
+    - env: ROS_DISTRO=indigo USE_DEB=false BEFORE_SCRIPT='$CI_SOURCE_PATH/.travis_before_script_opencv3.bash' NUMBER_OF_LOGS=12
 script:
   - source .travis/travis.sh
   - (cd doc && source setup.sh && make html)

jsk_perception/sample/sample_add_mask_image.launch

@@ -5,29 +5,29 @@
   <node name="image_publisher"
         pkg="jsk_perception" type="image_publisher.py">
     <rosparam subst_value="true">
-      file_name: $(find jsk_perception)/sample/laugh_out_loud_joke_book.jpg
+      file_name: $(find jsk_perception)/sample/image/laugh_out_loud_joke_book.jpg
     </rosparam>
   </node>
 
   <node name="mask_image_generator0"
         pkg="jsk_perception" type="mask_image_generator">
     <remap from="~input" to="image_publisher/output" />
     <rosparam>
-      offset_x: 100
-      offset_y: 100
-      width: 256
-      height: 256
+      offset_x: 50
+      offset_y: 50
+      width: 128
+      height: 128
     </rosparam>
   </node>
 
   <node name="mask_image_generator1"
         pkg="jsk_perception" type="mask_image_generator">
     <remap from="~input" to="image_publisher/output" />
     <rosparam>
-      offset_x: 200
-      offset_y: 200
-      width: 256
-      height: 256
+      offset_x: 100
+      offset_y: 100
+      width: 128
+      height: 128
     </rosparam>
   </node>
 

jsk_perception/sample/sample_bof_object_recognition.launch

@@ -4,12 +4,12 @@
 
   <node name="raw_image"
         pkg="jsk_perception" type="image_publisher.py">
-    <param name="~file_name" value="$(find jsk_perception)/sample/laugh_out_loud_joke_book.jpg" />
+    <param name="~file_name" value="$(find jsk_perception)/sample/image/laugh_out_loud_joke_book.jpg" />
   </node>
 
   <node name="mask_image"
         pkg="jsk_perception" type="image_publisher.py">
-    <param name="~file_name" value="$(find jsk_perception)/sample/laugh_out_loud_joke_book_mask.jpg" />
+    <param name="~file_name" value="$(find jsk_perception)/sample/image/laugh_out_loud_joke_book_mask.jpg" />
   </node>
 
   <node name="label_image"

jsk_perception/sample/sample_label_image_decomposer.launch

@@ -2,17 +2,30 @@
 
   <arg name="gui" default="true" />
 
-  <include file="$(find jsk_perception)/sample/sample_image_publisher.launch">
-    <arg name="gui" value="false" />
-  </include>
+  <node name="image_publisher"
+        pkg="jsk_perception" type="image_publisher.py">
+    <rosparam subst_value="true">
+      file_name: $(find jsk_perception)/sample/image/lena.jpg
+      encoding: bgr8
+      publish_info: false
+    </rosparam>
+  </node>
+
+  <!-- create label -->
+  <node name="grid_label"
+        pkg="jsk_perception" type="grid_label">
+    <remap from="~input" to="image_publisher/output" />
+    <rosparam>
+      label_size: 128
+    </rosparam>
+  </node>
 
   <node name="label_image_decomposer"
         pkg="jsk_perception" type="label_image_decomposer.py">
-    <remap from="~input" to="raw_image_bgr/image_color" />
-    <remap from="~input/label" to="label_image/label" />
+    <remap from="~input" to="image_publisher/output" />
+    <remap from="~input/label" to="grid_label/output" />
     <rosparam>
-      approximate_sync: true
-      queue_size: 100
+      queue_size: 30
     </rosparam>
   </node>
 

jsk_perception/sample/sample_mask_image_generator.launch

@@ -5,18 +5,18 @@
   <node name="image_publisher"
         pkg="jsk_perception" type="image_publisher.py">
     <rosparam subst_value="true">
-      file_name: $(find jsk_perception)/sample/laugh_out_loud_joke_book.jpg
+      file_name: $(find jsk_perception)/sample/image/laugh_out_loud_joke_book.jpg
     </rosparam>
   </node>
 
   <node name="mask_image_generator"
         pkg="jsk_perception" type="mask_image_generator">
     <remap from="~input" to="image_publisher/output" />
     <rosparam>
-      offset_x: 100
-      offset_y: 200
-      width: 256
-      height: 256
+      offset_x: 50
+      offset_y: 100
+      width: 128
+      height: 128
     </rosparam>
   </node>
 

jsk_perception/test/sklearn_classifier.test

@@ -7,10 +7,10 @@
   <test test-name="test_sklearn_classifier"
         name="test_sklearn_classifier"
         pkg="jsk_tools" type="test_topic_published.py"
-        retry="3">
+        retry="3" time-limit="120">
     <rosparam>
       topic_0: /sklearn_classifier/output
-      timeout_0: 30
+      timeout_0: 110
     </rosparam>
   </test>