Add --os option to rosdep for debian

This commit is contained in:
Kentaro Wada 2017-04-29 18:02:42 +09:00 committed by Paul Bovbel
parent 410e6ba650
commit debdde93f7
2 changed files with 2 additions and 2 deletions

View File

@ -61,7 +61,7 @@ wstool up
# package depdencies: install using rosdep. # package depdencies: install using rosdep.
cd ~/catkin_ws cd ~/catkin_ws
rosdep install -q -y -r --from-paths src --ignore-src --rosdistro $ROS_DISTRO rosdep install -q -y -r --from-paths src --ignore-src --rosdistro $ROS_DISTRO --os $DOCKER_IMAGE
travis_time_end travis_time_end
travis_time_start setup.script travis_time_start setup.script

View File

@ -17,7 +17,7 @@ before_install:
- export ROS_PARALLEL_JOBS='-j8 -l6' - export ROS_PARALLEL_JOBS='-j8 -l6'
script: script:
- echo "Testing branch $TRAVIS_BRANCH of $REPOSITORY_NAME" - echo "Testing branch $TRAVIS_BRANCH of $REPOSITORY_NAME"
- docker run --rm -i -v $CI_SOURCE_PATH:$CI_SOURCE_PATH -e "CI_SOURCE_PATH=$CI_SOURCE_PATH" -e "HOME=$HOME" -e "ROS_DISTRO=$ROS_DISTRO" -e "ROS_PARALLEL_JOBS=$ROS_PARALLEL_JOBS" -t $DOCKER_IMAGE sh -c "cd $CI_SOURCE_PATH; ./.travis.sh" - docker run --rm -i -v $CI_SOURCE_PATH:$CI_SOURCE_PATH -e "CI_SOURCE_PATH=$CI_SOURCE_PATH" -e "HOME=$HOME" -e "ROS_DISTRO=$ROS_DISTRO" -e "ROS_PARALLEL_JOBS=$ROS_PARALLEL_JOBS" -e "DOCKER_IMAGE=$DOCKER_IMAGE" -t $DOCKER_IMAGE sh -c "cd $CI_SOURCE_PATH; ./.travis.sh"
after_failure: after_failure:
- find ${HOME}/.ros/test_results -type f -exec echo "== {} ==" \; -exec cat {} \; - find ${HOME}/.ros/test_results -type f -exec echo "== {} ==" \; -exec cat {} \;
- for file in ${HOME}/.ros/log/rostest-*; do echo "=== $file ==="; cat $file; done - for file in ${HOME}/.ros/log/rostest-*; do echo "=== $file ==="; cat $file; done