Skip to content
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

add EXTRA_DEB environment variables #551

Merged
merged 2 commits into from
Sep 30, 2014
Merged

add EXTRA_DEB environment variables #551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
923a12f
add EXTRA_DEB environment variables
k-okada Sep 29, 2014
ffd33e6
install roslint for work_with_315_1_10 test
k-okada Sep 29, 2014
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
10 changes: 5 additions & 5 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ python:
compiler:
- gcc
env:
- ROS_DISTRO=groovy ROSWS=rosws BUILDER=rosbuild USE_DEB=true
- ROS_DISTRO=groovy ROSWS=rosws BUILDER=rosbuild USE_DEB=false
- ROS_DISTRO=groovy ROSWS=wstool BUILDER=catkin USE_DEB=true
- ROS_DISTRO=groovy ROSWS=wstool BUILDER=catkin USE_DEB=false
- ROS_DISTRO=groovy ROSWS=rosws BUILDER=rosbuild USE_DEB=true EXTRA_DEB=ros-groovy-navigation
- ROS_DISTRO=groovy ROSWS=rosws BUILDER=rosbuild USE_DEB=false EXTRA_DEB=ros-groovy-navigation
- ROS_DISTRO=groovy ROSWS=wstool BUILDER=catkin USE_DEB=true EXTRA_DEB=ros-groovy-navigation
- ROS_DISTRO=groovy ROSWS=wstool BUILDER=catkin USE_DEB=false EXTRA_DEB=ros-groovy-navigation
- ROS_DISTRO=hydro ROSWS=wstool BUILDER=catkin USE_DEB=true
- ROS_DISTRO=hydro ROSWS=wstool BUILDER=catkin USE_DEB=false
- TEST_TYPE=work_with_downstream TEST_PACKAGE=hironx-ros-bridge ROS_DISTRO=hydro
- TEST_TYPE=work_with_315_1_10 TEST_PACKAGE=hironx-ros-bridge ROS_DISTRO=hydro
- TEST_TYPE=work_with_315_1_10 TEST_PACKAGE=hironx-ros-bridge ROS_DISTRO=hydro EXTRA_DEB=ros-hydro-roslint
matrix:
allow_failures:
- env: ROS_DISTRO=groovy ROSWS=rosws BUILDER=rosbuild USE_DEB=false
Expand Down
1 change: 1 addition & 0 deletions .travis/travis.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ 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-rosbash
if [ $ROSWS == rosws ]; then sudo apt-get install -qq -y python-rosinstall ; fi
if [ $BUILDER == rosbuild ]; then sudo apt-get install -qq -y ros-$ROS_DISTRO-rosmake ; fi
if [ "$EXTRA_DEB" ]; then sudo apt-get install -qq -y $EXTRA_DEB; fi
# MongoDB hack - I don't fully understand this but its for moveit_warehouse
sudo apt-get remove -y -qq mongodb mongodb-10gen || echo "ok"
sudo apt-get install -y -qq mongodb-clients mongodb-server -o Dpkg::Options::="--force-confdef" || ecoh "ok" # default actions
Expand Down
1 change: 1 addition & 0 deletions .travis_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ 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-rosbash

if [ "$EXTRA_DEB" ]; then sudo apt-get install -qq -y $EXTRA_DEB; fi
###
pkg=$TEST_PACKAGE
sudo apt-get install -y ros-hydro-$pkg
Expand Down