noetic: install libpcl-features1.10, which is re-build debian package…

… with PointCloudLibrary/pcl#3623 patch
k-okada · Jan 5, 2023 · b24c1b0 · b24c1b0
1 parent 4152a70
commit b24c1b0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
@@ -66,7 +66,7 @@ jobs:
             NOT_TEST_INSTALL : true
             USE_JENKINS: true
             DOCKER_IMAGE_JENKINS: ros-ubuntu:20.04-pcl
-            BEFORE_SCRIPT : "sudo pip3 install numpy==1.17.5 scipy==1.3.3 scikit-image==0.16.2 PyWavelets==0.5.1 imageio==2.4.1 pandas==0.25.3; sudo pip3 install fcn chainercv chainer-mask-rcnn==0.3.0 decorator==4.4.2 chainer==7.8.1 protobuf==3.6.1 cupy-cuda91 pytesseract==0.3.10 Pillow==9.3.0 torch==1.4.0 torchvision==0.5.0;"
+            BEFORE_SCRIPT : "sudo pip3 install numpy==1.17.5 scipy==1.3.3 scikit-image==0.16.2 PyWavelets==0.5.1 imageio==2.4.1 pandas==0.25.3; sudo pip3 install fcn chainercv chainer-mask-rcnn==0.3.0 decorator==4.4.2 chainer==7.8.1 protobuf==3.6.1 cupy-cuda91 pytesseract==0.3.10 Pillow==9.3.0 torch==1.4.0 torchvision==0.5.0;sudo dpkg -i /workspace/.ros/data/libpcl-features1.10_1.10.0+dfsg-5ubuntu1_amd64.deb;"
             BUILD_PKGS: 'checkerboard_detector imagesift jsk_perception jsk_recognition_utils resized_image_transport'
             EXTRA_DEB: ros-noetic-pr2-description
             experimental : false
@@ -76,7 +76,7 @@ jobs:
             USE_JENKINS: true
             DOCKER_IMAGE_JENKINS: ros-ubuntu:20.04-pcl
             TEST_PKGS : 'jsk_pcl_ros_utils jsk_pcl_ros'
-            BEFORE_SCRIPT : "sudo pip3 install numpy==1.17.5 scipy==1.3.3 scikit-image==0.16.2 PyWavelets==0.5.1 imageio==2.4.1 pandas==0.25.3; sudo pip3 install fcn chainercv chainer-mask-rcnn==0.3.0 decorator==4.4.2 chainer==7.8.1 protobuf==3.6.1 cupy-cuda91 pytesseract==0.3.10 Pillow==9.3.0 torch==1.4.0 torchvision==0.5.0;"
+            BEFORE_SCRIPT : "sudo pip3 install numpy==1.17.5 scipy==1.3.3 scikit-image==0.16.2 PyWavelets==0.5.1 imageio==2.4.1 pandas==0.25.3; sudo pip3 install fcn chainercv chainer-mask-rcnn==0.3.0 decorator==4.4.2 chainer==7.8.1 protobuf==3.6.1 cupy-cuda91 pytesseract==0.3.10 Pillow==9.3.0 torch==1.4.0 torchvision==0.5.0;sudo dpkg -i /workspace/.ros/data/libpcl-features1.10_1.10.0+dfsg-5ubuntu1_amd64.deb;"
             BUILD_PKGS: 'jsk_pcl_ros_utils jsk_pcl_ros'
             EXTRA_DEB: ros-noetic-pr2-description
             experimental : false
@@ -86,7 +86,7 @@ jobs:
             USE_JENKINS: true
             DOCKER_IMAGE_JENKINS: ros-ubuntu:20.04-pcl
             TEST_PKGS : 'jsk_recognition_msgs' # to skip test
-            BEFORE_SCRIPT : "sudo pip3 install numpy==1.17.5 scipy==1.3.3 scikit-image==0.16.2 PyWavelets==0.5.1 imageio==2.4.1 pandas==0.25.3; sudo pip3 install fcn chainercv chainer-mask-rcnn==0.3.0 decorator==4.4.2 chainer==7.8.1 protobuf==3.6.1 cupy-cuda91 pytesseract==0.3.10 Pillow==9.3.0 torch==1.4.0 torchvision==0.5.0;"
+            BEFORE_SCRIPT : "sudo pip3 install numpy==1.17.5 scipy==1.3.3 scikit-image==0.16.2 PyWavelets==0.5.1 imageio==2.4.1 pandas==0.25.3; sudo pip3 install fcn chainercv chainer-mask-rcnn==0.3.0 decorator==4.4.2 chainer==7.8.1 protobuf==3.6.1 cupy-cuda91 pytesseract==0.3.10 Pillow==9.3.0 torch==1.4.0 torchvision==0.5.0;sudo dpkg -i /workspace/.ros/data/libpcl-features1.10_1.10.0+dfsg-5ubuntu1_amd64.deb;"
             EXTRA_DEB: ros-noetic-pr2-description
             experimental : false
 

diff --git a/jsk_perception/test/fcn_object_segmentation.test b/jsk_perception/test/fcn_object_segmentation.test
@@ -11,7 +11,7 @@
   <test test-name="test_fcn_object_segmentation"
         name="test_fcn_object_segmentation"
         pkg="jsk_tools" type="test_topic_published.py"
-        retry="3" time-limit="120">
+        time-limit="120">
     <rosparam>
       topic_0: /fcn_object_segmentation/output
       timeout_0: 120