Skip to content

Support melodic test #541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 9, 2020
Merged

Support melodic test #541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
67998bc
Support melodic test
k-okada May 6, 2020
053d124
add DEBIAN_FRONTEND for tzdata
k-okada May 7, 2020
bbc2731
melodic: allow_failure ros/ubuntu and fix for work_with_315_1_10
k-okada May 8, 2020
20905ff
315.1.10 does not work with melodic
k-okada May 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .travis.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ env | grep ROS
cd ${CI_SOURCE_PATH}

apt-get update
DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata
apt-get install -y sudo software-properties-common git wget sed
####### https://github.com/ros-planning/moveit/pull/581
if [ "$ROS_DISTRO" == "kinetic" ]; then
Expand All @@ -45,6 +46,9 @@ if [ "$TEST_TYPE" == work_with_315_1_10 ]; then sed -i "s@sudo dpkg -r --force-d
if [ "$TEST_TYPE" == work_with_315_1_10 ]; then sed -i 's%cat hrpsys/catkin.cmake%sed -i "s@foreach(_bin_file \\${_bin_files})@list(REMOVE_DUPLICATES _bin_files)\\nforeach(_bin_file \\${_bin_files})@" hrpsys/catkin.cmake\n cat hrpsys/catkin.cmake%' work_with_315_1_10_test.sh; fi
if [ "$TEST_TYPE" == work_with_315_1_10 ]; then sed -i 's@catkin_make_isolated -j1 -l1 --install --only-pkg-with-deps@catkin_make_isolated -j1 -l1 --install --only-pkg-with-deps hrpsys@' work_with_315_1_10_test.sh; fi
if [ "$TEST_TYPE" == work_with_315_1_10 ]; then sed -i 's@git clone http://github.com/fkanehiro/hrpsys-base --depth 1 -b 315.1.9 ../build_isolated/hrpsys/build/hrpsys-base-source@(git clone http://github.com/fkanehiro/hrpsys-base ../build_isolated/hrpsys/build/hrpsys-base-source; cd ../build_isolated/hrpsys/build/hrpsys-base-source; git checkout 315.1.9; sed -i s%-mt%% lib/util/CMakeLists.txt)@' work_with_315_1_10_test.sh; fi
# melodic
if [ "$TEST_TYPE" == work_with_315_1_10 -a "$ROS_DISTRO" == "melodic" ]; then sed -i 's@libcv-dev libhighgui-dev@libopencv-dev libopencv-highgui-dev ros-melodic-openrtm-aist@' work_with_315_1_10_test.sh; fi
if [ "$TEST_TYPE" == work_with_315_1_10 -a "$ROS_DISTRO" == "melodic" ]; then sed -i 's!# we use latest hrpsys_ocnfig.py for this case, so do not install them!sed -i "s@OPENRTM_VERSION STREQUAL \\\"1.1.0\\\"@(NOT (OPENRTM_VERSION VERSION_LESS \\\"1.1.0\\\")) AND (OPENRTM_VERSION VERSION_LESS \\\"1.2.0\\\")@" ../build_isolated/hrpsys/build/hrpsys-base-source/cmake_modules/FindOpenRTM.cmake\n\t\tsed -i "s@\\\(boost_.*\\\)-mt@\\1@" ../build_isolated/hrpsys/build/hrpsys-base-source/lib/util/CMakeLists.txt\n\t\tsed -i "s@-DHRPSYS_PACKAGE_VERSION@-fpermissive -Wno-deprecated -DHRPSYS_PACKAGE_VERSION@" ../build_isolated/hrpsys/build/hrpsys-base-source/CMakeLists.txt!' work_with_315_1_10_test.sh; fi
if [ "$TEST_TYPE" == work_with_315_1_10 ]; then TEST_TYPE=work_with_315_1_10 TEST_PACKAGE=hironx-ros-bridge bash ./work_with_315_1_10_test.sh; exit $? ; fi

echo "Testing branch $TRAVIS_BRANCH of $REPOSITORY_NAME"
Expand Down
9 changes: 8 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,25 @@ env:
- ROS_DISTRO=kinetic ROSWS=wstool BUILDER=catkin USE_DEB=true ROS_REPOSITORY_PATH=http://packages.ros.org/ros-shadow-fixed/ubuntu
- ROS_DISTRO=kinetic ROSWS=wstool BUILDER=catkin USE_DEB=false ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
- ROS_DISTRO=kinetic TEST_TYPE=work_with_315_1_10
- ROS_DISTRO=melodic ROSWS=wstool BUILDER=catkin USE_DEB=true ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
- ROS_DISTRO=melodic ROSWS=wstool BUILDER=catkin USE_DEB=true ROS_REPOSITORY_PATH=http://packages.ros.org/ros-shadow-fixed/ubuntu
- ROS_DISTRO=melodic ROSWS=wstool BUILDER=catkin USE_DEB=false ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
- ROS_DISTRO=melodic TEST_TYPE=work_with_315_1_10
matrix:
allow_failures:
- env: ROS_DISTRO=kinetic ROSWS=wstool BUILDER=catkin USE_DEB=true ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
- env: ROS_DISTRO=kinetic ROSWS=wstool BUILDER=catkin USE_DEB=false ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
- env: ROS_DISTRO=melodic ROSWS=wstool BUILDER=catkin USE_DEB=true ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
- env: ROS_DISTRO=melodic ROSWS=wstool BUILDER=catkin USE_DEB=false ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
- env: ROS_DISTRO=melodic TEST_TYPE=work_with_315_1_10
notifications:
email:
recipients:
- dev@opensource-robotics.tokyo.jp
on_success: always #[always|never|change] # default: change
on_failure: always #[always|never|change] # default: always
before_install: # Use this to prepare the system to install prerequisites or dependencies
- case $ROS_DISTRO in "hydro") export DISTRO=precise;; "indigo") export DISTRO=trusty;; "kinetic") export DISTRO=xenial;; esac;
- case $ROS_DISTRO in "hydro") export DISTRO=precise;; "indigo") export DISTRO=trusty;; "kinetic") export DISTRO=xenial;; "melodic") export DISTRO=bionic;; "noetic") export DISTRO=focal;; esac;
- export DOCKER_IMAGE=ubuntu:$DISTRO
- export CI_SOURCE_PATH=$(pwd)
- export REPOSITORY_NAME=${PWD##*/}
Expand Down