From 0ed3694c09d3fae7e4e0d4ea65f147743f0d3e69 Mon Sep 17 00:00:00 2001 From: Ryohei Ueda Date: Mon, 10 Mar 2014 19:39:29 +0900 Subject: [PATCH 01/18] #5: add groovy/catkin, groovy/rosbuild test --- .travis.yml | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index f8ecda955..46fe98d51 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,10 @@ python: - "2.7" compiler: - gcc +env: + - ROS_DISTRO=hydro ROSWS=wstool BUILDER=catkin + - ROS_DISTRO=groovy ROSWS=wstool BUILDER=catkin + - ROS_DISTRO=groovy ROSWS=rosws BUILDER=rosbuild BUILD_PACKAGES="-a" # posedetectiondb #notifications: # email: # recipients: @@ -14,14 +18,13 @@ compiler: # on_failure: always #[always|never|change] # default: always before_install: # Use this to prepare the system to install prerequisites or dependencies # Define some config vars - - export ROS_DISTRO=hydro - export CI_SOURCE_PATH=$(pwd) - export REPOSITORY_NAME=${PWD##*/} - echo "Testing branch $TRAVIS_BRANCH of $REPOSITORY_NAME" - sudo sh -c 'echo "deb http://packages.ros.org/ros/ubuntu precise main" > /etc/apt/sources.list.d/ros-latest.list' - wget http://packages.ros.org/ros.key -O - | sudo apt-key add - - sudo apt-get update -qq - - sudo apt-get install -qq -y python-catkin-pkg python-rosdep python-wstool ros-$ROS_DISTRO-catkin ros-$ROS_DISTRO-ros + - sudo apt-get install -qq -y python-catkin-pkg python-rosdep python-wstool ros-$ROS_DISTRO-catkin ros-$ROS_DISTRO-ros python-rosinstall # MongoDB hack - I don't fully understand this but its for moveit_warehouse - sudo apt-get remove -y mongodb mongodb-10gen - sudo apt-get install -y mongodb-clients mongodb-server -o Dpkg::Options::="--force-confdef" # default actions @@ -34,9 +37,11 @@ install: # Use this to install any prerequisites or dependencies necessary to ru # Create workspace - mkdir -p ~/ros/ws_$REPOSITORY_NAME/src - cd ~/ros/ws_$REPOSITORY_NAME/src - - wstool init . - - wstool merge http://raw.github.com/$TRAVIS_REPO_SLUG/$TRAVIS_BRANCH/.rosinstall - - wstool update + - $ROSWS init . + - $ROSWS merge file://$CI_SOURCE_PATH/.rosinstall + - if [ $ROSWS = rosws ] ; then $ROSWS merge /opt/ros/$ROS_DISTRO/.rosinstall; fi + - $ROSWS update -j10 + - if [ $ROSWS = rosws ] ; then $ROSWS set --git $REPOSITORY_NAME https://dummy.com/dummy -y; fi - ln -s $CI_SOURCE_PATH . # Link the repo we are testing to the new workspace - cd ../ # Install dependencies for source repos @@ -44,14 +49,14 @@ install: # Use this to install any prerequisites or dependencies necessary to ru before_script: # Use this to prepare your build for testing e.g. copy database configurations, environment variables, etc. - source /opt/ros/$ROS_DISTRO/setup.bash script: # All commands must exit with code 0 on success. Anything else is considered failure. - - catkin_make - - catkin_make test -j8 - - catkin_make install - #- rm -fr devel src build - - source install/setup.bash - #- find install -iname "*.test" -print0 | xargs -0 -n1 rostest + - cd ~/ros/ws_$REPOSITORY_NAME + - if [ $BUILDER = rosbuild ]; then source src/setup.sh; cd src; fi + - rospack profile + - if [ $BUILDER = catkin ]; then catkin_make -j4; else rosmake $BUILD_PACKAGES --profile --pjobs=4; fi + - if [ $BUILDER = catkin ]; then catkin_make test; else rosmake $BUILD_PACKAGES --test-only; fi + - if [ $BUILDER = catkin ]; then catkin_make install; fi + - if [ $BUILDER = catkin ]; then rm -fr devel src build; source install/setup.bash; else source setup.sh; fi after_failure: - if [ -e ./build/Testing/Temporary/LastTest.log ]; then cat ./build/Testing/Temporary/LastTest.log; fi - find ${HOME}/.ros/test_results -type f -exec echo "== {} ==" \; -exec cat {} \; - for file in ${HOME}/.ros/log/rostest-*; do echo "=== $file ==="; cat $file; done - From 397bb0ed06ef82910ccf5f0c2f0afda92b81b53f Mon Sep 17 00:00:00 2001 From: Ryohei Ueda Date: Mon, 10 Mar 2014 19:41:11 +0900 Subject: [PATCH 02/18] #5: commit to invoke travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 46fe98d51..41e487368 100644 --- a/.travis.yml +++ b/.travis.yml @@ -60,3 +60,4 @@ after_failure: - if [ -e ./build/Testing/Temporary/LastTest.log ]; then cat ./build/Testing/Temporary/LastTest.log; fi - find ${HOME}/.ros/test_results -type f -exec echo "== {} ==" \; -exec cat {} \; - for file in ${HOME}/.ros/log/rostest-*; do echo "=== $file ==="; cat $file; done + From bb406143cb4f667e6a7ba9183489ba1df06e425e Mon Sep 17 00:00:00 2001 From: Ryohei Ueda Date: Wed, 12 Mar 2014 21:49:33 +0900 Subject: [PATCH 03/18] #5: add jsk_roseus and jsk_common repo --- .rosinstall | 7 +++++++ .travis.yml | 10 +++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.rosinstall b/.rosinstall index 41872d556..069336c40 100644 --- a/.rosinstall +++ b/.rosinstall @@ -4,4 +4,11 @@ - git: uri: https://github.com/jsk-ros-pkg/jsk_model_tools.git local-name: jsk-ros-pkg/jsk_model_tools +- git: + uri: https://github.com/jsk-ros-pkg/jsk_roseus.git + local-name: jsk-ros-pkg/jsk_roseus +- git: + uri: https://github.com/jsk-ros-pkg/jsk_common.git + local-name: jsk-ros-pkg/jsk_common + diff --git a/.travis.yml b/.travis.yml index 41e487368..ba2c2d50d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,9 +7,9 @@ python: compiler: - gcc env: + - ROS_DISTRO=groovy ROSWS=rosws BUILDER=rosbuild BUILD_PACKAGES="pddl task_compiler" - ROS_DISTRO=hydro ROSWS=wstool BUILDER=catkin - ROS_DISTRO=groovy ROSWS=wstool BUILDER=catkin - - ROS_DISTRO=groovy ROSWS=rosws BUILDER=rosbuild BUILD_PACKAGES="-a" # posedetectiondb #notifications: # email: # recipients: @@ -45,19 +45,23 @@ install: # Use this to install any prerequisites or dependencies necessary to ru - ln -s $CI_SOURCE_PATH . # Link the repo we are testing to the new workspace - cd ../ # Install dependencies for source repos + - find -L src -name package.xml -exec dirname {} \; | xargs -n 1 -i find {} -name manifest.xml | xargs -n 1 -i mv {} {}.deprecated - rosdep install -r -n --from-paths src --ignore-src --rosdistro $ROS_DISTRO -y + - find -L src -name manifest.xml.deprecated | xargs -n 1 -i dirname {} | xargs -n 1 -i ln -sf `pwd`/{}/manifest.xml.deprecated `pwd`/{}/manifest.xml + - if [ $BUILDER = rosbuild ]; then source src/setup.sh; rosdep install -a -y -n -r; fi + - if [ $ROS_DISTRO = groovy ]; then echo sudo apt-get install ros-$ROS_DISTRO-common-tutorials ros-$ROS_DISTRO-audio-common ros-$ROS_DISTRO-navigation ros-$ROS_DISTRO-laser-filters ros-$ROS_DISTRO-camera-calibration-parsers ros-$ROS_DISTRO-depth-image-proc ros-$ROS_DISTRO-driver-base ros-$ROS_DISTRO-image-proc ros-$ROS_DISTRO-image-proc ros-$ROS_DISTRO-compressed-image-transport ros-$ROS_DISTRO-pr2-common ros-$ROS_DISTRO-pr2-controllers ros-$ROS_DISTRO-arm-navigation ros-$ROS_DISTRO-pr2-common-actions; fi before_script: # Use this to prepare your build for testing e.g. copy database configurations, environment variables, etc. - source /opt/ros/$ROS_DISTRO/setup.bash + - export CATKIN_PACKAGES="`find $CI_SOURCE_PATH -name package.xml | xargs -n 1 dirname | xargs -n 1 basename`" script: # All commands must exit with code 0 on success. Anything else is considered failure. - cd ~/ros/ws_$REPOSITORY_NAME - if [ $BUILDER = rosbuild ]; then source src/setup.sh; cd src; fi - rospack profile - if [ $BUILDER = catkin ]; then catkin_make -j4; else rosmake $BUILD_PACKAGES --profile --pjobs=4; fi - - if [ $BUILDER = catkin ]; then catkin_make test; else rosmake $BUILD_PACKAGES --test-only; fi + - if [ $BUILDER = catkin ]; then if [ "$CATKIN_PACKAGES" != "" ]; then catkin_make test --pkg $CATKIN_PACKAGES; fi; else rosmake $BUILD_PACKAGES --test-only; fi - if [ $BUILDER = catkin ]; then catkin_make install; fi - if [ $BUILDER = catkin ]; then rm -fr devel src build; source install/setup.bash; else source setup.sh; fi after_failure: - if [ -e ./build/Testing/Temporary/LastTest.log ]; then cat ./build/Testing/Temporary/LastTest.log; fi - find ${HOME}/.ros/test_results -type f -exec echo "== {} ==" \; -exec cat {} \; - for file in ${HOME}/.ros/log/rostest-*; do echo "=== $file ==="; cat $file; done - From 46feb0736198e01bb1d31de60c5a2e3f64446715 Mon Sep 17 00:00:00 2001 From: Ryohei Ueda Date: Wed, 12 Mar 2014 22:21:14 +0900 Subject: [PATCH 04/18] #5: add urdf-parser to install --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ba2c2d50d..1cada81af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,7 +49,7 @@ install: # Use this to install any prerequisites or dependencies necessary to ru - rosdep install -r -n --from-paths src --ignore-src --rosdistro $ROS_DISTRO -y - find -L src -name manifest.xml.deprecated | xargs -n 1 -i dirname {} | xargs -n 1 -i ln -sf `pwd`/{}/manifest.xml.deprecated `pwd`/{}/manifest.xml - if [ $BUILDER = rosbuild ]; then source src/setup.sh; rosdep install -a -y -n -r; fi - - if [ $ROS_DISTRO = groovy ]; then echo sudo apt-get install ros-$ROS_DISTRO-common-tutorials ros-$ROS_DISTRO-audio-common ros-$ROS_DISTRO-navigation ros-$ROS_DISTRO-laser-filters ros-$ROS_DISTRO-camera-calibration-parsers ros-$ROS_DISTRO-depth-image-proc ros-$ROS_DISTRO-driver-base ros-$ROS_DISTRO-image-proc ros-$ROS_DISTRO-image-proc ros-$ROS_DISTRO-compressed-image-transport ros-$ROS_DISTRO-pr2-common ros-$ROS_DISTRO-pr2-controllers ros-$ROS_DISTRO-arm-navigation ros-$ROS_DISTRO-pr2-common-actions; fi + - if [ $ROS_DISTRO = groovy ]; then echo sudo apt-get install ros-$ROS_DISTRO-common-tutorials ros-$ROS_DISTRO-audio-common ros-$ROS_DISTRO-navigation ros-$ROS_DISTRO-laser-filters ros-$ROS_DISTRO-camera-calibration-parsers ros-$ROS_DISTRO-depth-image-proc ros-$ROS_DISTRO-driver-base ros-$ROS_DISTRO-image-proc ros-$ROS_DISTRO-image-proc ros-$ROS_DISTRO-compressed-image-transport ros-$ROS_DISTRO-pr2-common ros-$ROS_DISTRO-pr2-controllers ros-$ROS_DISTRO-arm-navigation ros-$ROS_DISTRO-pr2-common-actions ros-$ROS_DISTRO-urdf-parser; fi before_script: # Use this to prepare your build for testing e.g. copy database configurations, environment variables, etc. - source /opt/ros/$ROS_DISTRO/setup.bash - export CATKIN_PACKAGES="`find $CI_SOURCE_PATH -name package.xml | xargs -n 1 dirname | xargs -n 1 basename`" From 22f9213a4c63cd77399ce7b80f6334974bf3f333 Mon Sep 17 00:00:00 2001 From: Ryohei Ueda Date: Wed, 12 Mar 2014 22:51:59 +0900 Subject: [PATCH 05/18] #5: fix install process on .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1cada81af..f92a2e996 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,7 +49,7 @@ install: # Use this to install any prerequisites or dependencies necessary to ru - rosdep install -r -n --from-paths src --ignore-src --rosdistro $ROS_DISTRO -y - find -L src -name manifest.xml.deprecated | xargs -n 1 -i dirname {} | xargs -n 1 -i ln -sf `pwd`/{}/manifest.xml.deprecated `pwd`/{}/manifest.xml - if [ $BUILDER = rosbuild ]; then source src/setup.sh; rosdep install -a -y -n -r; fi - - if [ $ROS_DISTRO = groovy ]; then echo sudo apt-get install ros-$ROS_DISTRO-common-tutorials ros-$ROS_DISTRO-audio-common ros-$ROS_DISTRO-navigation ros-$ROS_DISTRO-laser-filters ros-$ROS_DISTRO-camera-calibration-parsers ros-$ROS_DISTRO-depth-image-proc ros-$ROS_DISTRO-driver-base ros-$ROS_DISTRO-image-proc ros-$ROS_DISTRO-image-proc ros-$ROS_DISTRO-compressed-image-transport ros-$ROS_DISTRO-pr2-common ros-$ROS_DISTRO-pr2-controllers ros-$ROS_DISTRO-arm-navigation ros-$ROS_DISTRO-pr2-common-actions ros-$ROS_DISTRO-urdf-parser; fi + - if [ $ROS_DISTRO = groovy ]; then sudo apt-get install ros-$ROS_DISTRO-common-tutorials ros-$ROS_DISTRO-audio-common ros-$ROS_DISTRO-navigation ros-$ROS_DISTRO-laser-filters ros-$ROS_DISTRO-camera-calibration-parsers ros-$ROS_DISTRO-depth-image-proc ros-$ROS_DISTRO-driver-base ros-$ROS_DISTRO-image-proc ros-$ROS_DISTRO-image-proc ros-$ROS_DISTRO-compressed-image-transport ros-$ROS_DISTRO-pr2-common ros-$ROS_DISTRO-pr2-controllers ros-$ROS_DISTRO-arm-navigation ros-$ROS_DISTRO-pr2-common-actions ros-$ROS_DISTRO-urdf-parser; fi before_script: # Use this to prepare your build for testing e.g. copy database configurations, environment variables, etc. - source /opt/ros/$ROS_DISTRO/setup.bash - export CATKIN_PACKAGES="`find $CI_SOURCE_PATH -name package.xml | xargs -n 1 dirname | xargs -n 1 basename`" From 48391f7031c7bce715fba12900783831c5e8fc9b Mon Sep 17 00:00:00 2001 From: Ryohei Ueda Date: Wed, 12 Mar 2014 23:03:06 +0900 Subject: [PATCH 06/18] #5: fix BUILD_PACKAGES of .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f92a2e996..d26c0fd24 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ python: compiler: - gcc env: - - ROS_DISTRO=groovy ROSWS=rosws BUILDER=rosbuild BUILD_PACKAGES="pddl task_compiler" + - ROS_DISTRO=groovy ROSWS=rosws BUILDER=rosbuild BUILD_PACKAGES="jsk_baxter_robot jsk_nao_robot jsk_pr2_accessories jsk_pr2_desktop jsk_pr2_startup pr2_base_trajectory_action" - ROS_DISTRO=hydro ROSWS=wstool BUILDER=catkin - ROS_DISTRO=groovy ROSWS=wstool BUILDER=catkin #notifications: From 93d3c4f7074923360032b87debf9c51051fe339c Mon Sep 17 00:00:00 2001 From: Ryohei Ueda Date: Thu, 13 Mar 2014 01:11:25 +0900 Subject: [PATCH 07/18] #5: checkout face_detector_mono and snap mono on travis --- .rosinstall | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.rosinstall b/.rosinstall index 069336c40..b12754167 100644 --- a/.rosinstall +++ b/.rosinstall @@ -10,5 +10,10 @@ - git: uri: https://github.com/jsk-ros-pkg/jsk_common.git local-name: jsk-ros-pkg/jsk_common - +- svn: + uri: https://svn.code.sf.net/p/tum-ros-pkg/code/perception/ + local-name: tum-ros-pkg/perception +- svn: + uri: https://svn.code.sf.net/p/tum-ros-pkg/code/highlevel/SnapMapICP + local-name: tum-ros-pkg/highlevel/SnapMapICP From 117c5dc30482f42f227d59455a09109a4da17f07 Mon Sep 17 00:00:00 2001 From: Ryohei Ueda Date: Thu, 13 Mar 2014 01:44:21 +0900 Subject: [PATCH 08/18] #5: add openni-camera on travis --- .rosinstall | 4 +++- .travis.yml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.rosinstall b/.rosinstall index b12754167..a6e0ed8dd 100644 --- a/.rosinstall +++ b/.rosinstall @@ -16,4 +16,6 @@ - svn: uri: https://svn.code.sf.net/p/tum-ros-pkg/code/highlevel/SnapMapICP local-name: tum-ros-pkg/highlevel/SnapMapICP - +- git: + uri: https://github.com/ahornung/nao_robot.git + local-name: humanoid_stacks/nao_robot diff --git a/.travis.yml b/.travis.yml index d26c0fd24..90a785043 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,7 +49,7 @@ install: # Use this to install any prerequisites or dependencies necessary to ru - rosdep install -r -n --from-paths src --ignore-src --rosdistro $ROS_DISTRO -y - find -L src -name manifest.xml.deprecated | xargs -n 1 -i dirname {} | xargs -n 1 -i ln -sf `pwd`/{}/manifest.xml.deprecated `pwd`/{}/manifest.xml - if [ $BUILDER = rosbuild ]; then source src/setup.sh; rosdep install -a -y -n -r; fi - - if [ $ROS_DISTRO = groovy ]; then sudo apt-get install ros-$ROS_DISTRO-common-tutorials ros-$ROS_DISTRO-audio-common ros-$ROS_DISTRO-navigation ros-$ROS_DISTRO-laser-filters ros-$ROS_DISTRO-camera-calibration-parsers ros-$ROS_DISTRO-depth-image-proc ros-$ROS_DISTRO-driver-base ros-$ROS_DISTRO-image-proc ros-$ROS_DISTRO-image-proc ros-$ROS_DISTRO-compressed-image-transport ros-$ROS_DISTRO-pr2-common ros-$ROS_DISTRO-pr2-controllers ros-$ROS_DISTRO-arm-navigation ros-$ROS_DISTRO-pr2-common-actions ros-$ROS_DISTRO-urdf-parser; fi + - if [ $ROS_DISTRO = groovy ]; then sudo apt-get install ros-$ROS_DISTRO-common-tutorials ros-$ROS_DISTRO-audio-common ros-$ROS_DISTRO-navigation ros-$ROS_DISTRO-laser-filters ros-$ROS_DISTRO-camera-calibration-parsers ros-$ROS_DISTRO-depth-image-proc ros-$ROS_DISTRO-driver-base ros-$ROS_DISTRO-image-proc ros-$ROS_DISTRO-image-proc ros-$ROS_DISTRO-compressed-image-transport ros-$ROS_DISTRO-pr2-common ros-$ROS_DISTRO-pr2-controllers ros-$ROS_DISTRO-arm-navigation ros-$ROS_DISTRO-pr2-common-actions ros-$ROS_DISTRO-urdf-parser ros-$ROS_DISTRO-openni-camera; fi before_script: # Use this to prepare your build for testing e.g. copy database configurations, environment variables, etc. - source /opt/ros/$ROS_DISTRO/setup.bash - export CATKIN_PACKAGES="`find $CI_SOURCE_PATH -name package.xml | xargs -n 1 dirname | xargs -n 1 basename`" From 4462a2a91099264000d9a6c057558966a384bb47 Mon Sep 17 00:00:00 2001 From: Ryohei Ueda Date: Thu, 13 Mar 2014 02:51:59 +0900 Subject: [PATCH 09/18] #5: checkout jsk_recognition to travis --- .rosinstall | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.rosinstall b/.rosinstall index a6e0ed8dd..11358edd9 100644 --- a/.rosinstall +++ b/.rosinstall @@ -10,6 +10,9 @@ - git: uri: https://github.com/jsk-ros-pkg/jsk_common.git local-name: jsk-ros-pkg/jsk_common +- git: + uri: https://github.com/jsk-ros-pkg/jsk_recognition.git + local-name: jsk-ros-pkg/jsk_recognition - svn: uri: https://svn.code.sf.net/p/tum-ros-pkg/code/perception/ local-name: tum-ros-pkg/perception From 2338837c1653b3d2d5871d0d4978abbe639644c3 Mon Sep 17 00:00:00 2001 From: Ryohei Ueda Date: Thu, 13 Mar 2014 03:56:22 +0900 Subject: [PATCH 10/18] #5: checkout openrave_planning on travis --- .rosinstall | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.rosinstall b/.rosinstall index 11358edd9..6866f8ad7 100644 --- a/.rosinstall +++ b/.rosinstall @@ -13,6 +13,9 @@ - git: uri: https://github.com/jsk-ros-pkg/jsk_recognition.git local-name: jsk-ros-pkg/jsk_recognition +- git: + uri: https://github.com/jsk-ros-pkg/openrave_planning.git + local-name: jsk-ros-pkg/openrave_planning - svn: uri: https://svn.code.sf.net/p/tum-ros-pkg/code/perception/ local-name: tum-ros-pkg/perception From ba3882b295d483ec2b4cb59b50a26eda1178b54e Mon Sep 17 00:00:00 2001 From: Ryohei Ueda Date: Thu, 13 Mar 2014 05:45:41 +0900 Subject: [PATCH 11/18] #5: add bosch shared autonomy to rosinstall --- .rosinstall | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.rosinstall b/.rosinstall index 6866f8ad7..127aba191 100644 --- a/.rosinstall +++ b/.rosinstall @@ -25,3 +25,6 @@ - git: uri: https://github.com/ahornung/nao_robot.git local-name: humanoid_stacks/nao_robot +- svn: + uri: http://svn.code.sf.net/p/bosch-ros-pkg/code/trunk/stacks/bosch_shared_autonomy + local-name: bosch-ros-pkg/stacks/bosch_shared_autonomy From 380502bebbb3a615b817fdd4eb10c8e846221973 Mon Sep 17 00:00:00 2001 From: Ryohei Ueda Date: Thu, 13 Mar 2014 11:23:14 +0900 Subject: [PATCH 12/18] #5: install pr2-teleop-app on travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 90a785043..4274b3ae9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,7 +49,7 @@ install: # Use this to install any prerequisites or dependencies necessary to ru - rosdep install -r -n --from-paths src --ignore-src --rosdistro $ROS_DISTRO -y - find -L src -name manifest.xml.deprecated | xargs -n 1 -i dirname {} | xargs -n 1 -i ln -sf `pwd`/{}/manifest.xml.deprecated `pwd`/{}/manifest.xml - if [ $BUILDER = rosbuild ]; then source src/setup.sh; rosdep install -a -y -n -r; fi - - if [ $ROS_DISTRO = groovy ]; then sudo apt-get install ros-$ROS_DISTRO-common-tutorials ros-$ROS_DISTRO-audio-common ros-$ROS_DISTRO-navigation ros-$ROS_DISTRO-laser-filters ros-$ROS_DISTRO-camera-calibration-parsers ros-$ROS_DISTRO-depth-image-proc ros-$ROS_DISTRO-driver-base ros-$ROS_DISTRO-image-proc ros-$ROS_DISTRO-image-proc ros-$ROS_DISTRO-compressed-image-transport ros-$ROS_DISTRO-pr2-common ros-$ROS_DISTRO-pr2-controllers ros-$ROS_DISTRO-arm-navigation ros-$ROS_DISTRO-pr2-common-actions ros-$ROS_DISTRO-urdf-parser ros-$ROS_DISTRO-openni-camera; fi + - if [ $ROS_DISTRO = groovy ]; then sudo apt-get install ros-$ROS_DISTRO-common-tutorials ros-$ROS_DISTRO-audio-common ros-$ROS_DISTRO-navigation ros-$ROS_DISTRO-laser-filters ros-$ROS_DISTRO-camera-calibration-parsers ros-$ROS_DISTRO-depth-image-proc ros-$ROS_DISTRO-driver-base ros-$ROS_DISTRO-image-proc ros-$ROS_DISTRO-image-proc ros-$ROS_DISTRO-compressed-image-transport ros-$ROS_DISTRO-pr2-common ros-$ROS_DISTRO-pr2-controllers ros-$ROS_DISTRO-arm-navigation ros-$ROS_DISTRO-pr2-common-actions ros-$ROS_DISTRO-urdf-parser ros-$ROS_DISTRO-openni-camera ros-$ROS_DISTRO-pr2-teleop-app; fi before_script: # Use this to prepare your build for testing e.g. copy database configurations, environment variables, etc. - source /opt/ros/$ROS_DISTRO/setup.bash - export CATKIN_PACKAGES="`find $CI_SOURCE_PATH -name package.xml | xargs -n 1 dirname | xargs -n 1 basename`" From dca8efc7ce071a7879688ddcb7c1e855ae351f3e Mon Sep 17 00:00:00 2001 From: Ryohei Ueda Date: Thu, 13 Mar 2014 11:41:12 +0900 Subject: [PATCH 13/18] #5: install pr2-navigation on travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4274b3ae9..124cad076 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,7 +49,7 @@ install: # Use this to install any prerequisites or dependencies necessary to ru - rosdep install -r -n --from-paths src --ignore-src --rosdistro $ROS_DISTRO -y - find -L src -name manifest.xml.deprecated | xargs -n 1 -i dirname {} | xargs -n 1 -i ln -sf `pwd`/{}/manifest.xml.deprecated `pwd`/{}/manifest.xml - if [ $BUILDER = rosbuild ]; then source src/setup.sh; rosdep install -a -y -n -r; fi - - if [ $ROS_DISTRO = groovy ]; then sudo apt-get install ros-$ROS_DISTRO-common-tutorials ros-$ROS_DISTRO-audio-common ros-$ROS_DISTRO-navigation ros-$ROS_DISTRO-laser-filters ros-$ROS_DISTRO-camera-calibration-parsers ros-$ROS_DISTRO-depth-image-proc ros-$ROS_DISTRO-driver-base ros-$ROS_DISTRO-image-proc ros-$ROS_DISTRO-image-proc ros-$ROS_DISTRO-compressed-image-transport ros-$ROS_DISTRO-pr2-common ros-$ROS_DISTRO-pr2-controllers ros-$ROS_DISTRO-arm-navigation ros-$ROS_DISTRO-pr2-common-actions ros-$ROS_DISTRO-urdf-parser ros-$ROS_DISTRO-openni-camera ros-$ROS_DISTRO-pr2-teleop-app; fi + - if [ $ROS_DISTRO = groovy ]; then sudo apt-get install ros-$ROS_DISTRO-common-tutorials ros-$ROS_DISTRO-audio-common ros-$ROS_DISTRO-navigation ros-$ROS_DISTRO-laser-filters ros-$ROS_DISTRO-camera-calibration-parsers ros-$ROS_DISTRO-depth-image-proc ros-$ROS_DISTRO-driver-base ros-$ROS_DISTRO-image-proc ros-$ROS_DISTRO-image-proc ros-$ROS_DISTRO-compressed-image-transport ros-$ROS_DISTRO-pr2-common ros-$ROS_DISTRO-pr2-controllers ros-$ROS_DISTRO-arm-navigation ros-$ROS_DISTRO-pr2-common-actions ros-$ROS_DISTRO-urdf-parser ros-$ROS_DISTRO-openni-camera ros-$ROS_DISTRO-pr2-teleop-app ros-$ROS_DISTRO-pr2-navigation; fi before_script: # Use this to prepare your build for testing e.g. copy database configurations, environment variables, etc. - source /opt/ros/$ROS_DISTRO/setup.bash - export CATKIN_PACKAGES="`find $CI_SOURCE_PATH -name package.xml | xargs -n 1 dirname | xargs -n 1 basename`" From 15ec929af81b0eea66cb10a41256d23abb48f219 Mon Sep 17 00:00:00 2001 From: Ryohei Ueda Date: Thu, 13 Mar 2014 11:59:16 +0900 Subject: [PATCH 14/18] #5: install pr2-navigation-apps on travis for pr2_2dnav --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 124cad076..0186fe64c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,7 +49,7 @@ install: # Use this to install any prerequisites or dependencies necessary to ru - rosdep install -r -n --from-paths src --ignore-src --rosdistro $ROS_DISTRO -y - find -L src -name manifest.xml.deprecated | xargs -n 1 -i dirname {} | xargs -n 1 -i ln -sf `pwd`/{}/manifest.xml.deprecated `pwd`/{}/manifest.xml - if [ $BUILDER = rosbuild ]; then source src/setup.sh; rosdep install -a -y -n -r; fi - - if [ $ROS_DISTRO = groovy ]; then sudo apt-get install ros-$ROS_DISTRO-common-tutorials ros-$ROS_DISTRO-audio-common ros-$ROS_DISTRO-navigation ros-$ROS_DISTRO-laser-filters ros-$ROS_DISTRO-camera-calibration-parsers ros-$ROS_DISTRO-depth-image-proc ros-$ROS_DISTRO-driver-base ros-$ROS_DISTRO-image-proc ros-$ROS_DISTRO-image-proc ros-$ROS_DISTRO-compressed-image-transport ros-$ROS_DISTRO-pr2-common ros-$ROS_DISTRO-pr2-controllers ros-$ROS_DISTRO-arm-navigation ros-$ROS_DISTRO-pr2-common-actions ros-$ROS_DISTRO-urdf-parser ros-$ROS_DISTRO-openni-camera ros-$ROS_DISTRO-pr2-teleop-app ros-$ROS_DISTRO-pr2-navigation; fi + - if [ $ROS_DISTRO = groovy ]; then sudo apt-get install ros-$ROS_DISTRO-common-tutorials ros-$ROS_DISTRO-audio-common ros-$ROS_DISTRO-navigation ros-$ROS_DISTRO-laser-filters ros-$ROS_DISTRO-camera-calibration-parsers ros-$ROS_DISTRO-depth-image-proc ros-$ROS_DISTRO-driver-base ros-$ROS_DISTRO-image-proc ros-$ROS_DISTRO-image-proc ros-$ROS_DISTRO-compressed-image-transport ros-$ROS_DISTRO-pr2-common ros-$ROS_DISTRO-pr2-controllers ros-$ROS_DISTRO-arm-navigation ros-$ROS_DISTRO-pr2-common-actions ros-$ROS_DISTRO-urdf-parser ros-$ROS_DISTRO-openni-camera ros-$ROS_DISTRO-pr2-teleop-app ros-$ROS_DISTRO-pr2-navigation ros-$ROS_DISTRO-pr2-navigation-apps; fi before_script: # Use this to prepare your build for testing e.g. copy database configurations, environment variables, etc. - source /opt/ros/$ROS_DISTRO/setup.bash - export CATKIN_PACKAGES="`find $CI_SOURCE_PATH -name package.xml | xargs -n 1 dirname | xargs -n 1 basename`" From cb6aeabf1356e47cdf358a33438e1d1f4516b153 Mon Sep 17 00:00:00 2001 From: Ryohei Ueda Date: Thu, 13 Mar 2014 14:11:26 +0900 Subject: [PATCH 15/18] #5: add pr2-arm-navigation required by jsk_pr2_startup on travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0186fe64c..887480809 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,7 +49,7 @@ install: # Use this to install any prerequisites or dependencies necessary to ru - rosdep install -r -n --from-paths src --ignore-src --rosdistro $ROS_DISTRO -y - find -L src -name manifest.xml.deprecated | xargs -n 1 -i dirname {} | xargs -n 1 -i ln -sf `pwd`/{}/manifest.xml.deprecated `pwd`/{}/manifest.xml - if [ $BUILDER = rosbuild ]; then source src/setup.sh; rosdep install -a -y -n -r; fi - - if [ $ROS_DISTRO = groovy ]; then sudo apt-get install ros-$ROS_DISTRO-common-tutorials ros-$ROS_DISTRO-audio-common ros-$ROS_DISTRO-navigation ros-$ROS_DISTRO-laser-filters ros-$ROS_DISTRO-camera-calibration-parsers ros-$ROS_DISTRO-depth-image-proc ros-$ROS_DISTRO-driver-base ros-$ROS_DISTRO-image-proc ros-$ROS_DISTRO-image-proc ros-$ROS_DISTRO-compressed-image-transport ros-$ROS_DISTRO-pr2-common ros-$ROS_DISTRO-pr2-controllers ros-$ROS_DISTRO-arm-navigation ros-$ROS_DISTRO-pr2-common-actions ros-$ROS_DISTRO-urdf-parser ros-$ROS_DISTRO-openni-camera ros-$ROS_DISTRO-pr2-teleop-app ros-$ROS_DISTRO-pr2-navigation ros-$ROS_DISTRO-pr2-navigation-apps; fi + - if [ $ROS_DISTRO = groovy ]; then sudo apt-get install ros-$ROS_DISTRO-common-tutorials ros-$ROS_DISTRO-audio-common ros-$ROS_DISTRO-navigation ros-$ROS_DISTRO-laser-filters ros-$ROS_DISTRO-camera-calibration-parsers ros-$ROS_DISTRO-depth-image-proc ros-$ROS_DISTRO-driver-base ros-$ROS_DISTRO-image-proc ros-$ROS_DISTRO-image-proc ros-$ROS_DISTRO-compressed-image-transport ros-$ROS_DISTRO-pr2-common ros-$ROS_DISTRO-pr2-controllers ros-$ROS_DISTRO-arm-navigation ros-$ROS_DISTRO-pr2-common-actions ros-$ROS_DISTRO-urdf-parser ros-$ROS_DISTRO-openni-camera ros-$ROS_DISTRO-pr2-teleop-app ros-$ROS_DISTRO-pr2-navigation ros-$ROS_DISTRO-pr2-navigation-apps ros-$ROS_DISTRO-pr2-arm-navigation; fi before_script: # Use this to prepare your build for testing e.g. copy database configurations, environment variables, etc. - source /opt/ros/$ROS_DISTRO/setup.bash - export CATKIN_PACKAGES="`find $CI_SOURCE_PATH -name package.xml | xargs -n 1 dirname | xargs -n 1 basename`" From 69e32dd66ca5a810e94e7485d83bb7c939facbd2 Mon Sep 17 00:00:00 2001 From: Ryohei Ueda Date: Thu, 13 Mar 2014 14:42:53 +0900 Subject: [PATCH 16/18] #5: add pr2-interactive-manipulation to use pr2_gripper_sensor_action on travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 887480809..80a06b110 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,7 +49,7 @@ install: # Use this to install any prerequisites or dependencies necessary to ru - rosdep install -r -n --from-paths src --ignore-src --rosdistro $ROS_DISTRO -y - find -L src -name manifest.xml.deprecated | xargs -n 1 -i dirname {} | xargs -n 1 -i ln -sf `pwd`/{}/manifest.xml.deprecated `pwd`/{}/manifest.xml - if [ $BUILDER = rosbuild ]; then source src/setup.sh; rosdep install -a -y -n -r; fi - - if [ $ROS_DISTRO = groovy ]; then sudo apt-get install ros-$ROS_DISTRO-common-tutorials ros-$ROS_DISTRO-audio-common ros-$ROS_DISTRO-navigation ros-$ROS_DISTRO-laser-filters ros-$ROS_DISTRO-camera-calibration-parsers ros-$ROS_DISTRO-depth-image-proc ros-$ROS_DISTRO-driver-base ros-$ROS_DISTRO-image-proc ros-$ROS_DISTRO-image-proc ros-$ROS_DISTRO-compressed-image-transport ros-$ROS_DISTRO-pr2-common ros-$ROS_DISTRO-pr2-controllers ros-$ROS_DISTRO-arm-navigation ros-$ROS_DISTRO-pr2-common-actions ros-$ROS_DISTRO-urdf-parser ros-$ROS_DISTRO-openni-camera ros-$ROS_DISTRO-pr2-teleop-app ros-$ROS_DISTRO-pr2-navigation ros-$ROS_DISTRO-pr2-navigation-apps ros-$ROS_DISTRO-pr2-arm-navigation; fi + - if [ $ROS_DISTRO = groovy ]; then sudo apt-get install ros-$ROS_DISTRO-common-tutorials ros-$ROS_DISTRO-audio-common ros-$ROS_DISTRO-navigation ros-$ROS_DISTRO-laser-filters ros-$ROS_DISTRO-camera-calibration-parsers ros-$ROS_DISTRO-depth-image-proc ros-$ROS_DISTRO-driver-base ros-$ROS_DISTRO-image-proc ros-$ROS_DISTRO-image-proc ros-$ROS_DISTRO-compressed-image-transport ros-$ROS_DISTRO-pr2-common ros-$ROS_DISTRO-pr2-controllers ros-$ROS_DISTRO-arm-navigation ros-$ROS_DISTRO-pr2-common-actions ros-$ROS_DISTRO-urdf-parser ros-$ROS_DISTRO-openni-camera ros-$ROS_DISTRO-pr2-teleop-app ros-$ROS_DISTRO-pr2-navigation ros-$ROS_DISTRO-pr2-navigation-apps ros-$ROS_DISTRO-pr2-arm-navigation ros-$ROS_DISTRO-pr2-interactive-manipulation; fi before_script: # Use this to prepare your build for testing e.g. copy database configurations, environment variables, etc. - source /opt/ros/$ROS_DISTRO/setup.bash - export CATKIN_PACKAGES="`find $CI_SOURCE_PATH -name package.xml | xargs -n 1 dirname | xargs -n 1 basename`" From 0857cd35e55d26fe6b252a5ca633a941f80bdf1d Mon Sep 17 00:00:00 2001 From: Ryohei Ueda Date: Thu, 13 Mar 2014 15:01:30 +0900 Subject: [PATCH 17/18] #5: add jsk_demos to travis --- .rosinstall | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.rosinstall b/.rosinstall index 127aba191..ecda348a2 100644 --- a/.rosinstall +++ b/.rosinstall @@ -13,6 +13,9 @@ - git: uri: https://github.com/jsk-ros-pkg/jsk_recognition.git local-name: jsk-ros-pkg/jsk_recognition +- git: + uri: https://github.com/jsk-ros-pkg/jsk_demos.git + local-name: jsk-ros-pkg/jsk_demos - git: uri: https://github.com/jsk-ros-pkg/openrave_planning.git local-name: jsk-ros-pkg/openrave_planning From 35cd381505307b6e435c7b43df8c77f8137fae45 Mon Sep 17 00:00:00 2001 From: Ryohei Ueda Date: Thu, 13 Mar 2014 15:30:14 +0900 Subject: [PATCH 18/18] #5: add jsk_smart_apps to travis --- .rosinstall | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.rosinstall b/.rosinstall index ecda348a2..7ca7428a8 100644 --- a/.rosinstall +++ b/.rosinstall @@ -16,6 +16,9 @@ - git: uri: https://github.com/jsk-ros-pkg/jsk_demos.git local-name: jsk-ros-pkg/jsk_demos +- git: + uri: https://github.com/jsk-ros-pkg/jsk_smart_apps.git + local-name: jsk-ros-pkg/jsk_smart_apps - git: uri: https://github.com/jsk-ros-pkg/openrave_planning.git local-name: jsk-ros-pkg/openrave_planning