From b6ba078764f50bb7fb85bde7a87c292b3f687ff5 Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Fri, 27 Apr 2018 14:28:52 +0900 Subject: [PATCH] Imported upstream version '0.1.11' of 'upstream' --- .travis/.travis.yml | 20 ++++-- .travis/CHANGELOG.rst | 85 ++++++++++++++++++++++++++ .travis/README.md | 15 ++++- .travis/docker.sh | 10 +-- .travis/package.xml | 3 +- .travis/rosdep-install.sh | 9 ++- .travis/test/camera.sdf | 59 ++++++++++++++++++ .travis/test/gazebo.test | 23 +++++-- .travis/travis.sh | 45 +++++++++----- .travis/travis_jenkins.py | 36 ++++++----- jsk_planning/CHANGELOG.rst | 3 + jsk_planning/package.xml | 2 +- pddl/pddl_msgs/CHANGELOG.rst | 3 + pddl/pddl_msgs/package.xml | 2 +- pddl/pddl_planner/CHANGELOG.rst | 5 ++ pddl/pddl_planner/package.xml | 2 +- pddl/pddl_planner/src/pddl.py | 1 + pddl/pddl_planner_viewer/CHANGELOG.rst | 3 + pddl/pddl_planner_viewer/package.xml | 2 +- task_compiler/CHANGELOG.rst | 3 + task_compiler/package.xml | 2 +- 21 files changed, 279 insertions(+), 54 deletions(-) create mode 100644 .travis/test/camera.sdf diff --git a/.travis/.travis.yml b/.travis/.travis.yml index a9d0c48..a54c4b0 100644 --- a/.travis/.travis.yml +++ b/.travis/.travis.yml @@ -2,7 +2,7 @@ # Generic MoveIt Travis Continuous Integration Configuration File # Works with all MoveIt! repositories/branches # Author: Dave Coleman, Jonathan Bohren -language: generic +language: c++ cache: apt: true pip: true @@ -12,8 +12,6 @@ sudo: required dist: trusty services: - docker -matrix: - fast_finish: true notifications: slack: jsk-robotics:Av7tc8wj3IWkLYvlTzHE7x2g env: @@ -49,6 +47,7 @@ env: - USE_DOCKER=true ROS_DISTRO=jade TRAVIS_REPO_SLUG=jsk-ros-pkg/jsk_travis - USE_DOCKER=true ROS_DISTRO=jade TRAVIS_REPO_SLUG=jsk-ros-pkg/jsk_travis TRAVIS_BRANCH=master TRAVIS_COMMIT='HEAD' TRAVIS_PULL_REQUEST='false' - USE_DOCKER=true ROS_DISTRO=kinetic + - USE_DOCKER=true ROS_DISTRO=lunar # gazebo - USE_DOCKER=true TEST_GAZEBO=true ROS_DISTRO=indigo - USE_DOCKER=true TEST_GAZEBO=true ROS_DISTRO=jade @@ -56,9 +55,22 @@ env: - USE_JENKINS=true TEST_GAZEBO=true ROS_DISTRO=indigo - USE_JENKINS=true TEST_GAZEBO=true ROS_DISTRO=jade - USE_JENKINS=true TEST_GAZEBO=true ROS_DISTRO=kinetic +matrix: + fast_finish: true + allow_failures: + - env: USE_DOCKER=true TEST_GAZEBO=true ROS_DISTRO=jade + - env: USE_DOCKER=true TEST_GAZEBO=true ROS_DISTRO=kinetic + - env: USE_JENKINS=true TEST_GAZEBO=true ROS_DISTRO=jade + - env: USE_JENKINS=true TEST_GAZEBO=true ROS_DISTRO=kinetic + include: + - env: + - USE_DOCKER=true + - ROS_DISTRO=kinetic + sudo: false before_script: + - export ROSDEP_ADDITIONAL_OPTIONS='-n -v --ignore-src' # run rosdep without -r and -v - mkdir .travis; cp -r * .travis # need to copy, since directory starting from . is ignoreed by catkin build - - export BEFORE_SCRIPT="rm -fr jsk_travis/CATKIN_IGNORE; ${BEFORE_SCRIPT}" + - export BEFORE_SCRIPT="rm -fr jsk_travis/CATKIN_IGNORE; git clone https://github.com/ros/ros_tutorials -b ${ROS_DISTRO}-devel;${BEFORE_SCRIPT}" - if [ "${USE_CATKIN_MAKE}" == "true" ] ;then sed -i 's@catkin build -i -v --limit-status-rate 0.001@catkin_make@' .travis/travis.sh; fi - if [ "${USE_CATKIN_MAKE}" == "true" ] ;then sed -i 's@catkin run_tests --no-deps --limit-status-rate 0.001@catkin_make run_tests@' .travis/travis.sh; fi - if [ "${USE_CATKIN_MAKE}" == "true" ] ;then export CATKIN_PARALLEL_JOBS="--no-color" ; fi diff --git a/.travis/CHANGELOG.rst b/.travis/CHANGELOG.rst index 036e7c1..db68986 100644 --- a/.travis/CHANGELOG.rst +++ b/.travis/CHANGELOG.rst @@ -2,6 +2,91 @@ Changelog for package jsk_travis ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.4.35 (2017-12-30) +------------------- +* Merge pull request `#353 `_ from k-okada/exit_rosdep + when rosdep install is called with -r, do not exit with 1 +* when rosdep install is called with -r, do not exit with 1 +* Merge pull request `#351 `_ from furushchev/fix-eof-error + travis.sh: fix EOFError +* travis.sh: fix EOFError +* Contributors: Furushchev, Kei Okada + +0.4.34 (2017-11-01) +------------------- +* travis.sh: use get-pip.py to get pipt (`#349 `_) +* Contributors: Yuki Furuta + +0.4.33 (2017-08-30) +------------------- +* Fix typo about docker pulling DOCKER_IMAGE_JENKINS (`#346 `_) +* Contributors: Kentaro Wada + +0.4.32 (2017-08-29) +------------------- +* Run docker pull to get latest docker image if possible (`#345 `_) +* Support sudo: false of Travis option (`#344 `_) +* Documentize NOT_TEST_INSTALL (`#343 `_) +* Support testing on lunar (`#342 `_) +* Contributors: Kentaro Wada + +0.4.31 (2017-08-19) +------------------- +* use http instaed of https (`#341 `_) +* Contributors: Kei Okada + +0.4.30 (2017-08-06) +------------------- +* job_name = 'jenkins+ job_name + TRAVIS_REPO_SLUG' (`#340 `_) +* Contributors: Kei Okada + +0.4.29 (2017-08-05) +------------------- +* filename must be less than 255 length (`#339 `_) +* Contributors: Kei Okada + +0.4.28 (2017-08-05) +------------------- +* run travis without rosdep -r (`#337 `_) + * add -v rosdep options + * add ros_tutorials to workspece for test + * run travis without rosdep -r + +* to run docker, we do not need -ti option (`#338 `_) + -i, --interactive Keep STDIN open even if not attached + -t, --tty Allocate a pseudo-TTY +* Contributors: Kei Okada + +0.4.27 (2017-07-18) +------------------- +* apt-get install patch command (`#332 `_ ) +* Support ROSDEP_ADDITIONAL_OPTIONS on Jenkins (`#333 `_) +* use language: c++ , to avoid custom python (`#334 `_) +* Contributors: Kei Okada, Kentaro Wada + +0.4.26 (2017-07-01) +------------------- +* Correct exit status in rosdep-install.sh (`#331 `_ ) +* Add option to use custom docker image in Jenkins job (`#330 `_ ) + * Update README for DOCKER_IMAGE_JENKINS env + * Add DOCKER_IMAGE_JENKINS option + +* Run rosdep init when required (`#327 `_) + * This is necessary to use ros:indigo docker image by DOCKER_IMAGE env, + because rosdep init has already been called. +* Contributors: Kentaro Wada + +0.4.25 (2017-02-17) +------------------- +* Use X server of travis node (`#323 `_) + * [.travis.yml] allow failures on jade / kinetic gazebo test + * enable gazebo camera test + * Use host X11 server for docker +* [travis_jenkins.py] delete: remove containers more than 48 hours ago (`#324 `_) + * [README.md] add description of DOCKER_RUN_OPTION + * [travis_jenkins.py] delete: remove containers more than 48 hours ago +* Contributors: Kei Okada, Yuki Furuta + 0.4.24 (2017-02-14) ------------------- * [travis.sh] fix typo EXTRA_DEBS -> EXTRA_DEBS diff --git a/.travis/README.md b/.travis/README.md index 58b9140..01dfbfc 100644 --- a/.travis/README.md +++ b/.travis/README.md @@ -74,6 +74,15 @@ see [this document](https://github.com/jsk-ros-pkg/jsk_common#restart-travis-fro Force to use docker on travis. +* `DOCKER_IMAGE_JENKINS` (defualt: `ros-ubuntu:$(lsb_release -sr)`) + + Docker image used in Jenkins. + +* `DOCKER_RUN_OPTION` (default: `--rm`) + + Options passed to `docker run` if `USE_DOCKER` is `true`. Ignored otherwise. + **NOTE** If `--rm` is not set, the container remains even after job is finished. You must be responsible for removing it. + * `USE_JENKINS` (default: `false`) Force to run test on jenkins. jenkins server is more powerful than travis environment, @@ -109,6 +118,10 @@ see [this document](https://github.com/jsk-ros-pkg/jsk_common#restart-travis-fro The options passed when rosdep install. +* `NOT_TEST_INSTALL` (none or `true`, default: none) + + Flag to skip testing catkin install in addition to devel build. + ## Config Files * `.travis.rosinstall`, `.travis.rosinstall.{{ ROS_DISTRO }}` @@ -123,7 +136,7 @@ see [this document](https://github.com/jsk-ros-pkg/jsk_common#restart-travis-fro ``` mv CATKIN_IGNORE CATKIN_IGNORE.bak -catkin_generate_changelog --skip-merges +catkin_generate_changelog emacs -nw CHANGELOG.rst # prettify CHANGELOG so we can understand what has changed git commit -m "update CHANGELOG" CHANGELOG.rst catkin_prepare_release --no-push # please type "Y" to all diff --git a/.travis/docker.sh b/.travis/docker.sh index 2be2afe..d1c09d5 100755 --- a/.travis/docker.sh +++ b/.travis/docker.sh @@ -106,7 +106,7 @@ if [ "$(which sudo)" = "" ]; then fi # install fundamental packages sudo -E apt-get -y -qq update -sudo -E apt-get -y -qq install apt-utils build-essential git lsb-release python-pip python-setuptools wget +sudo -E apt-get -y -qq install apt-utils build-essential curl git lsb-release python-pip python-setuptools wget # add user for testing adduser --disabled-password --gecos "" travis @@ -114,13 +114,9 @@ adduser travis sudo chown -R travis:travis $HOME echo "travis ALL=(ALL) NOPASSWD:ALL" | sudo tee -a /etc/sudoers -# setup virtual display -sudo -E apt-get -y -qq install mesa-utils xserver-xorg-video-dummy xvfb -export DISPLAY=:0 -sudo -E Xorg -noreset +extension GLX +extension RANDR +extension RENDER -logfile /tmp/xorg.log -config dummy.xorg.conf $DISPLAY & -sleep 3 +# check display +sudo -E apt-get -y -qq install mesa-utils glxinfo | grep GLX -export QT_X11_NO_MITSHM=1 # see http://wiki.ros.org/docker/Tutorials/GUI # ensure setting testing environment same as travis export USE_JENKINS=false diff --git a/.travis/package.xml b/.travis/package.xml index 1c9ad5b..8104752 100644 --- a/.travis/package.xml +++ b/.travis/package.xml @@ -1,6 +1,6 @@ jsk_travis - 0.4.24 + 0.4.35 jsk_travis scripts BSD Kei Okada @@ -13,6 +13,7 @@ rostest rospy_tutorials gazebo_ros + gazebo_plugins diff --git a/.travis/rosdep-install.sh b/.travis/rosdep-install.sh index 9dec9ed..324cfc2 100755 --- a/.travis/rosdep-install.sh +++ b/.travis/rosdep-install.sh @@ -13,7 +13,14 @@ while [ $EXIT_STATUS == 1 -a $COUNT -lt 3 ] ; do # try 3 times with "Continue i EXIT_STATUS=$? [ $EXIT_STATUS == 0 ] || sleep 30 done -[ $EXIT_STATUS == 0 ] || rosdep install -q -y --rosdistro $ROS_DISTRO $ROSDEP_ADDITIONAL_OPTIONS --from-paths ${ROS_PACKAGE_PATH_REVERSED} . +if [ $EXIT_STATUS != 0 ]; then + rosdep install -q -y --rosdistro $ROS_DISTRO $ROSDEP_ADDITIONAL_OPTIONS --from-paths ${ROS_PACKAGE_PATH_REVERSED} . + EXIT_STATUS=$? +fi find -L . -name manifest.xml.deprecated | xargs -n 1 -i dirname {} | xargs -n 1 -i mv `pwd`/{}/manifest.xml.deprecated `pwd`/{}/manifest.xml +#if -r is included in ROSDEP_ADDITIONAL_OPTIONS, always returns true +[[ "$ROSDEP_ADDITIONAL_OPTIONS" =~ " -r " ]] && exit 0 + +exit $EXIT_STATUS diff --git a/.travis/test/camera.sdf b/.travis/test/camera.sdf new file mode 100644 index 0000000..2c5b26c --- /dev/null +++ b/.travis/test/camera.sdf @@ -0,0 +1,59 @@ + + + + true + 0 0 0 0 0 0 + + + -0.055 0 0 0 0 0 + + + 0.1 0.04 0.025 + + + + 0.7 0.7 0.7 1 + 0.7 0.7 0.7 1 + 0.1 0.1 0.1 1 + 0 0 0 0 + + + + 0 0 0 0 1.57 0 + + + 0.013 + 0.01 + + + + 0.1 0.1 0.1 1 + 0.1 0.1 0.1 1 + 0.1 0.1 0.1 1 + 0 0 0 0 + + + + + 1.047 + + 320 + 240 + R8G8B8 + + + 0.1 + 5.0 + + + 15.0 + + camera + image_raw + camera_info + camera_link + + + + + diff --git a/.travis/test/gazebo.test b/.travis/test/gazebo.test index b4ab73a..88dffb9 100644 --- a/.travis/test/gazebo.test +++ b/.travis/test/gazebo.test @@ -1,14 +1,29 @@ - + + + + + + retry="3" time-limit="300"> topic: /gazebo/model_states hz: 1000.0 - hzerror: 500.0 + hzerror: 800.0 test_duration: 10.0 - wait_time: 180.0 + wait_time: 300.0 + + + + + topic: /camera/image_raw + hz: 15.0 + hzerror: 15.0 + test_duration: 10.0 + wait_time: 300.0 diff --git a/.travis/travis.sh b/.travis/travis.sh index ba29285..7cc49bd 100755 --- a/.travis/travis.sh +++ b/.travis/travis.sh @@ -70,12 +70,29 @@ if [ "$USE_DOCKER" = true ]; then case $ROS_DISTRO in hydro) DISTRO=precise;; indigo|jade) DISTRO=trusty;; - kinetic) DISTRO=xenial;; + kinetic|lunar) DISTRO=xenial;; *) DISTRO=trusty;; esac export DOCKER_IMAGE=ubuntu:$DISTRO fi - docker run -it -v $HOME:$HOME \ + + DOCKER_XSERVER_OPTIONS='' + if [ "$TRAVIS_SUDO" = true ]; then + # use host xserver + sudo apt-get update -q || echo Ignore error of apt-get update + sudo apt-get -y -qq install mesa-utils x11-xserver-utils xserver-xorg-video-dummy + export DISPLAY=:0 + sudo Xorg -noreset +extension GLX +extension RANDR +extension RENDER -logfile /tmp/xorg.log -config $CI_SOURCE_PATH/.travis/dummy.xorg.conf $DISPLAY & + sleep 3 # wait x server up + glxinfo | grep GLX + export QT_X11_NO_MITSHM=1 # http://wiki.ros.org/docker/Tutorials/GUI + xhost +local:root + DOCKER_XSERVER_OPTIONS='-v /tmp/.X11-unix:/tmp/.X11-unix -e QT_X11_NO_MITSHM -e DISPLAY' + fi + + docker pull $DOCKER_IMAGE || true + docker run -v $HOME:$HOME \ + $DOCKER_XSERVER_OPTIONS \ -e TRAVIS_BRANCH -e TRAVIS_COMMIT -e TRAVIS_JOB_ID -e TRAVIS_OS_NAME -e TRAVIS_PULL_REQUEST -e TRAVIS_REPO_SLUG \ -e CI_SOURCE_PATH -e HOME -e REPOSITORY_NAME \ -e BUILD_PKGS -e TARGET_PKGS -e TEST_PKGS \ @@ -92,7 +109,7 @@ if [ "$USE_DOCKER" = true ]; then exit $DOCKER_EXIT_CODE fi -if [ "$USE_TRAVIS" != "true" ] && [ "$ROS_DISTRO" == "indigo" -o "$ROS_DISTRO" == "jade" -o "$ROS_DISTRO" == "kinetic" -o "${USE_JENKINS}" == "true" ] && [ "$TRAVIS_JOB_ID" ]; then +if [ "$USE_TRAVIS" != "true" ] && [ "$ROS_DISTRO" != "hydro" -o "${USE_JENKINS}" == "true" ] && [ "$TRAVIS_JOB_ID" ]; then pip install --user python-jenkins -q ./.travis/travis_jenkins.py exit $? @@ -119,11 +136,11 @@ if [ ! "$CATKIN_PARALLEL_TEST_JOBS" ]; then export CATKIN_PARALLEL_TEST_JOBS="$C if [ ! "$ROS_REPOSITORY_PATH" ]; then export ROS_REPOSITORY_PATH="http://packages.ros.org/ros-shadow-fixed/ubuntu"; fi if [ ! "$ROSDEP_ADDITIONAL_OPTIONS" ]; then export ROSDEP_ADDITIONAL_OPTIONS="-n -q -r --ignore-src"; fi echo "Testing branch $TRAVIS_BRANCH of $REPOSITORY_NAME" -# Setup pip -# FIXME: need to specify pip version to 6.0.7 to avoid unexpected error -# https://github.com/jsk-ros-pkg/jsk_robot/pull/523#issuecomment-164699366 -sudo easy_install 'pip==6.0.7' -sudo pip install -U -q pip setuptools + +# Install pip +curl https://bootstrap.pypa.io/get-pip.py | sudo python - +sudo -E pip install -U -q pip setuptools + # Setup apt sudo -E sh -c 'echo "deb $ROS_REPOSITORY_PATH `lsb_release -cs` main" > /etc/apt/sources.list.d/ros-latest.list' wget http://packages.ros.org/ros.key -O - | sudo apt-key add - @@ -160,7 +177,9 @@ travis_time_start setup_rosdep # Setup rosdep pip --version rosdep --version -sudo rosdep init +if [ ! -e /etc/ros/rosdep/sources.list.d/20-default.list ]; then + sudo rosdep init +fi ret=1 rosdep update || while [ $ret != 0 ]; do sleep 1; rosdep update && ret=0 || echo "failed"; done @@ -197,8 +216,8 @@ cd ~/ros/ws_$REPOSITORY_NAME catkin init catkin config $CATKIN_TOOLS_CONFIG_OPTIONS cd ~/ros/ws_$REPOSITORY_NAME/src +wstool init if [ "$USE_DEB" == false ]; then - wstool init . if [ -e $CI_SOURCE_PATH/.travis.rosinstall ]; then # install (maybe unreleased version) dependencies from source wstool merge file://$CI_SOURCE_PATH/.travis.rosinstall @@ -210,7 +229,7 @@ if [ "$USE_DEB" == false ]; then wstool update fi ln -s $CI_SOURCE_PATH . # Link the repo we are testing to the new workspace -if [ "$USE_DEB" == source -a -e $REPOSITORY_NAME/setup_upstream.sh ]; then wstool init .; $REPOSITORY_NAME/setup_upstream.sh -w ~/ros/ws_$REPOSITORY_NAME ; wstool update; fi +if [ "$USE_DEB" == source -a -e $REPOSITORY_NAME/setup_upstream.sh ]; then $REPOSITORY_NAME/setup_upstream.sh -w ~/ros/ws_$REPOSITORY_NAME ; wstool update; fi # disable hrpsys/doc generation find . -ipath "*/hrpsys/CMakeLists.txt" -exec sed -i s'@if(ENABLE_DOXYGEN)@if(0)@' {} \; # disable metapackage @@ -222,10 +241,6 @@ if [ "$ROSDEP_UPDATE_QUIET" == "true" ]; then fi source /opt/ros/$ROS_DISTRO/setup.bash > /tmp/$$.x 2>&1; grep export\ [^_] /tmp/$$.x # ROS_PACKAGE_PATH is important for rosdep -if [ ! -e .rosinstall ]; then - echo "- git: {local-name: $REPOSITORY_NAME, uri: 'http://github.com/$TRAVIS_REPO_SLUG'}" >> .rosinstall -fi - travis_time_end travis_time_start before_script diff --git a/.travis/travis_jenkins.py b/.travis/travis_jenkins.py index aae1fea..c6dfdda 100755 --- a/.travis/travis_jenkins.py +++ b/.travis/travis_jenkins.py @@ -37,6 +37,7 @@ CATKIN_PARALLEL_TEST_JOBS = %(CATKIN_PARALLEL_TEST_JOBS)s<br> BUILDING_PKG = %(BUILD_PKGS)s<br> ROS_REPOSITORY_PATH = %(ROS_REPOSITORY_PATH)s<br> + ROSDEP_ADDITIONAL_OPTIONS = %(ROSDEP_ADDITIONAL_OPTIONS)s<br> DOCKER_RUN_OPTION = %(DOCKER_RUN_OPTION)s<br> false @@ -88,7 +89,7 @@ trap "pwd; sudo rm -fr $WORKSPACE/${BUILD_TAG} || echo 'ok'" EXIT # try git clone until success -until git clone http://github.com/%(TRAVIS_REPO_SLUG)s ${BUILD_TAG}/%(TRAVIS_REPO_SLUG)s +until git clone https://github.com/%(TRAVIS_REPO_SLUG)s ${BUILD_TAG}/%(TRAVIS_REPO_SLUG)s do echo "Retrying" done @@ -109,19 +110,13 @@ mkdir .travis; cp -r * .travis # need to copy, since directory starting from . is ignoreed by catkin build fi -# remove containers created/exited more than 48 hours ago -timeout 10s sudo docker ps -a > /tmp/$$.docker_ps_a.txt || exit 1 # check docker isn't held up -for container in `cat /tmp/$$.docker_ps_a.txt | egrep '^.*days ago' | awk '{print $1}'`; do - sudo docker rm $container || echo ok -done -rm -f /tmp/$$.docker_ps_a.txt - # run watchdog for kill orphan docker container .travis/travis_watchdog.py %(DOCKER_CONTAINER_NAME)s --sudo & sudo docker stop %(DOCKER_CONTAINER_NAME)s || echo "docker stop %(DOCKER_CONTAINER_NAME)s ends with $?" sudo docker rm %(DOCKER_CONTAINER_NAME)s || echo "docker rm %(DOCKER_CONTAINER_NAME)s ends with $?" -sudo docker run %(DOCKER_RUN_OPTION)s -t \\ +sudo docker pull %(DOCKER_IMAGE_JENKINS)s || true +sudo docker run %(DOCKER_RUN_OPTION)s \\ --name %(DOCKER_CONTAINER_NAME)s \\ -e ROS_DISTRO='%(ROS_DISTRO)s' \\ -e USE_DEB='%(USE_DEB)s' \\ @@ -139,6 +134,7 @@ -e CATKIN_PARALLEL_TEST_JOBS='%(CATKIN_PARALLEL_TEST_JOBS)s' \\ -e BUILD_PKGS='%(BUILD_PKGS)s' \\ -e ROS_REPOSITORY_PATH='%(ROS_REPOSITORY_PATH)s' \\ + -e ROSDEP_ADDITIONAL_OPTIONS='%(ROSDEP_ADDITIONAL_OPTIONS)s' \\ -e DOCKER_RUN_OPTION='%(DOCKER_RUN_OPTION)s' \\ -e HOME=/workspace \\ -v $WORKSPACE/${BUILD_TAG}:/workspace \\ @@ -147,7 +143,7 @@ -v /export/data1/ros_data:/workspace/.ros/data \\ -v /export/data1/ros_test_data:/workspace/.ros/test_data \\ -v /tmp/.X11-unix:/tmp/.X11-unix:rw \\ - -w /workspace ros-ubuntu:%(LSB_RELEASE)s /bin/bash \\ + -w /workspace %(DOCKER_IMAGE_JENKINS)s /bin/bash \\ -c "$(cat <<EOL cd %(TRAVIS_REPO_SLUG)s @@ -158,7 +154,7 @@ mkdir log export ROS_LOG_DIR=\$PWD/log apt-get update -qq || echo Ignore error of apt-get update -apt-get install -qq -y git wget sudo lsb-release ccache apt-cacher-ng +apt-get install -qq -y curl git wget sudo lsb-release ccache apt-cacher-ng patch # setup ccache ccache -M 20G # set maximum size of ccache to 20G @@ -308,6 +304,7 @@ def wait_for_building(name, number): CATKIN_PARALLEL_TEST_JOBS = env.get('CATKIN_PARALLEL_TEST_JOBS', '') BUILD_PKGS = env.get('BUILD_PKGS', '') ROS_REPOSITORY_PATH = env.get('ROS_REPOSITORY_PATH', '') +ROSDEP_ADDITIONAL_OPTIONS = env.get('ROSDEP_ADDITIONAL_OPTIONS', '') DOCKER_CONTAINER_NAME = '_'.join([TRAVIS_REPO_SLUG.replace('/','.'), TRAVIS_JOB_NUMBER]) DOCKER_RUN_OPTION = env.get('DOCKER_RUN_OPTION', '--rm') NUMBER_OF_LOGS_TO_KEEP = env.get('NUMBER_OF_LOGS_TO_KEEP', '3') @@ -338,6 +335,7 @@ def wait_for_building(name, number): CATKIN_PARALLEL_TEST_JOBS = %(CATKIN_PARALLEL_TEST_JOBS)s BUILD_PKGS = %(BUILD_PKGS)s ROS_REPOSITORY_PATH = %(ROS_REPOSITORY_PATH)s +ROSDEP_ADDITIONAL_OPTIONS = %(ROSDEP_ADDITIONAL_OPTIONS)s DOCKER_CONTAINER_NAME = %(DOCKER_CONTAINER_NAME)s DOCKER_RUN_OPTION = %(DOCKER_RUN_OPTION)s NUMBER_OF_LOGS_TO_KEEP = %(NUMBER_OF_LOGS_TO_KEEP)s @@ -347,19 +345,18 @@ def wait_for_building(name, number): if env.get('ROS_DISTRO') == 'hydro': LSB_RELEASE = '12.04' UBUNTU_DISTRO = 'precise' -elif env.get('ROS_DISTRO') == 'indigo': - LSB_RELEASE = '14.04' - UBUNTU_DISTRO = 'trusty' -elif env.get('ROS_DISTRO') == 'jade': +elif env.get('ROS_DISTRO') in ['indigo', 'jade']: LSB_RELEASE = '14.04' UBUNTU_DISTRO = 'trusty' -elif env.get('ROS_DISTRO') == 'kinetic': +elif env.get('ROS_DISTRO') in ['kinetic', 'lunar']: LSB_RELEASE = '16.04' UBUNTU_DISTRO = 'xenial' else: LSB_RELEASE = '14.04' UBUNTU_DISTRO = 'trusty' +DOCKER_IMAGE_JENKINS = env.get('DOCKER_IMAGE_JENKINS', 'ros-ubuntu:%s' % LSB_RELEASE) + ### start here j = Jenkins('http://jenkins.jsk.imi.i.u-tokyo.ac.jp:8080/', 'k-okada', '22f8b1c4812dad817381a05f41bef16b') @@ -393,6 +390,13 @@ def wait_for_building(name, number): ) ) job_name = re.sub(r'[^0-9A-Za-z]+', '-', job_name) +# filename must be within 255 +if len(job_name) >= 128 : # 'jenkins+ job_naem + TRAVIS_REPO_SLUG' + import hashlib + m = hashlib.md5() + m.update(job_name) + job_name=job_name[:128]+'-'+m.hexdigest() + if j.job_exists(job_name) is None: j.create_job(job_name, jenkins.EMPTY_CONFIG_XML) diff --git a/jsk_planning/CHANGELOG.rst b/jsk_planning/CHANGELOG.rst index f124290..ce89f42 100644 --- a/jsk_planning/CHANGELOG.rst +++ b/jsk_planning/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package jsk_planning ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.1.11 (2018-04-26) +------------------- + 0.1.10 (2017-03-03) ------------------- diff --git a/jsk_planning/package.xml b/jsk_planning/package.xml index f210ee1..d1b89a8 100644 --- a/jsk_planning/package.xml +++ b/jsk_planning/package.xml @@ -1,7 +1,7 @@ jsk_planning - 0.1.10 + 0.1.11

Metapackage that contains planning package for jsk-ros-pkg

 diff --git a/pddl/pddl_msgs/CHANGELOG.rst b/pddl/pddl_msgs/CHANGELOG.rst index 0323a18..dfbaab9 100644 --- a/pddl/pddl_msgs/CHANGELOG.rst +++ b/pddl/pddl_msgs/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package pddl_msgs ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.1.11 (2018-04-26) +------------------- + 0.1.10 (2017-03-03) ------------------- diff --git a/pddl/pddl_msgs/package.xml b/pddl/pddl_msgs/package.xml index e278837..e0e43d1 100644 --- a/pddl/pddl_msgs/package.xml +++ b/pddl/pddl_msgs/package.xml @@ -1,6 +1,6 @@ pddl_msgs - 0.1.10 + 0.1.11 message for pddl planner Ryohei Ueda diff --git a/pddl/pddl_planner/CHANGELOG.rst b/pddl/pddl_planner/CHANGELOG.rst index 7bb07ac..3b2d453 100644 --- a/pddl/pddl_planner/CHANGELOG.rst +++ b/pddl/pddl_planner/CHANGELOG.rst @@ -2,6 +2,11 @@ Changelog for package pddl_planner ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.1.11 (2018-04-26) +------------------- +* pddl_planner: pddl.py: remove (REACH-GOAL) on action which emerges occasionally (`#61 `_) +* Contributors: Yuki Furuta + 0.1.10 (2017-03-03) ------------------- * [task_compiler] fix: symbol is compared with string (`#60 `_) diff --git a/pddl/pddl_planner/package.xml b/pddl/pddl_planner/package.xml index 09540ab..bab98db 100644 --- a/pddl/pddl_planner/package.xml +++ b/pddl/pddl_planner/package.xml @@ -1,6 +1,6 @@ pddl_planner - 0.1.10 + 0.1.11 pddl planner wrappers Ryohei Ueda diff --git a/pddl/pddl_planner/src/pddl.py b/pddl/pddl_planner/src/pddl.py index 34d7b76..7aa73b7 100755 --- a/pddl/pddl_planner/src/pddl.py +++ b/pddl/pddl_planner/src/pddl.py @@ -71,6 +71,7 @@ def parse_pddl_result_ffha(self, output): for y in [re.search("\([^\)]+\)", x) for x in step_before_after[1].split("Total cost")[0].split("\n")[1:]] if y != None] + results = filter(lambda a: a.find("(REACH-GOAL)") < 0, results) rospy.loginfo("result => %s" % results) return results else: diff --git a/pddl/pddl_planner_viewer/CHANGELOG.rst b/pddl/pddl_planner_viewer/CHANGELOG.rst index 7e34e95..a726970 100644 --- a/pddl/pddl_planner_viewer/CHANGELOG.rst +++ b/pddl/pddl_planner_viewer/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package pddl_planner_viewer ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.1.11 (2018-04-26) +------------------- + 0.1.10 (2017-03-03) ------------------- diff --git a/pddl/pddl_planner_viewer/package.xml b/pddl/pddl_planner_viewer/package.xml index 7c30208..b1388a6 100644 --- a/pddl/pddl_planner_viewer/package.xml +++ b/pddl/pddl_planner_viewer/package.xml @@ -1,6 +1,6 @@ pddl_planner_viewer - 0.1.10 + 0.1.11 a viewer of pddl_planner. Ryohei Ueda diff --git a/task_compiler/CHANGELOG.rst b/task_compiler/CHANGELOG.rst index 51a7c1c..0b3a423 100644 --- a/task_compiler/CHANGELOG.rst +++ b/task_compiler/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package task_compiler ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.1.11 (2018-04-26) +------------------- + 0.1.10 (2017-03-03) ------------------- * [task_compiler] fix: symbol is compared with string (`#60 `_) diff --git a/task_compiler/package.xml b/task_compiler/package.xml index 0472387..c406f99 100644 --- a/task_compiler/package.xml +++ b/task_compiler/package.xml @@ -1,6 +1,6 @@ task_compiler - 0.1.10 + 0.1.11 task_compiler Compiler that translate task description in PDDL (Planning Domain Description Language) to SMACH (state machine based execution and coordination system) description.