Merge pull request jsk-ros-pkg#1307 from garaemon/update-travis-for-pip

Update travis for pip
wkentaro · Dec 15, 2015 · 774cf3c · 774cf3c
2 parents 9c04bb1 + 1572b1e
commit 774cf3c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/.travis b/.travis
diff --git a/jsk_network_tools/package.xml b/jsk_network_tools/package.xml
@@ -4,7 +4,7 @@
   <version>2.0.9</version>
   <description>jsk_network_tools</description>
 
-  <maintainer email="furuta@jsk.imi.i.u-tokyo.ac.jp">Yusuke Furuta</maintainer>
+  <maintainer email="ueda@jsk.t.u-tokyo.ac.jp">Ryohei Ueda</maintainer>
 
   <license>BSD</license>
 

diff --git a/jsk_ros_patch/image_view2/test/rectangle_mouse_event.launch b/jsk_ros_patch/image_view2/test/rectangle_mouse_event.launch
@@ -38,7 +38,8 @@
 
   <test test-name="image_view2_topics"
         name="image_view2_topics"
-        pkg="jsk_tools" type="test_topic_published.py">
+        pkg="jsk_tools" type="test_topic_published.py"
+        retry="3">
     <rosparam>
       topic_0: /camera_0/image/screenrectangle_image
       timeout_0: 10

diff --git a/jsk_tools/launch/local_pc_monitor.launch b/jsk_tools/launch/local_pc_monitor.launch
@@ -5,6 +5,7 @@
   <arg name="LOAD5_THRESHOLD" default="3.0" />
   <arg name="ENFORCE_CLOCK_SPEED" default="false" />
   <arg name="NTP_HOSTNAME" default="cmachine"/>
+  <arg name="NO_NTP_MONITOR" default="false" />
   <group ns="pc_monitor">
     <node pkg="pr2_computer_monitor"
           name="$(anon cpu_monitor)"
@@ -20,7 +21,8 @@
     <node pkg="pr2_computer_monitor"
           name="$(anon ntp_monitor)"
           type="ntp_monitor.py"
-          args="$(arg NTP_HOSTNAME)"/>
+          args="$(arg NTP_HOSTNAME)"
+          unless="$(arg NO_NTP_MONITOR)"/>
     <node pkg="jsk_network_tools"
           type="network_status.py"
           name="$(anon network_status)">

diff --git a/jsk_topic_tools/package.xml b/jsk_topic_tools/package.xml
@@ -3,7 +3,7 @@
   <version>2.0.9</version>
   <description>jsk_topic_tools</description>
   <maintainer email="k-okada@jsk.t.u-tokyo.ac.jp">Kei Okada</maintainer>
-  <maintainer email="furuta@jsk.t.u-tokyo.ac.jp">Yusuke Furuta</maintainer>
+  <maintainer email="ueda@jsk.t.u-tokyo.ac.jp">Ryohei Ueda</maintainer>
 
   <license>BSD</license>