Skip to content

Commit

Permalink
Merge pull request jsk-ros-pkg#103 from k-okada/support_jade
Browse files Browse the repository at this point in the history
[.travis.yml] add test code to check jade environment
  • Loading branch information
k-okada committed Jun 19, 2015
2 parents 889eedc + 9b0e2bb commit 58caf79
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
5 changes: 4 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,14 @@ env:
- ROS_DISTRO=hydro AFTER_INSTALL=""
- ROS_DISTRO=hydro AFTER_INSTALL="mongodb-clients"
- ROS_DISTRO=hydro AFTER_INSTALL="ros-hydro-roseus"
- ROS_DISTRO=hydro BEFORE_SCRIPT="git clone http://github.com/jsk-ros-pkg/jsk_common /tmp/jsk_common_$$; cp -r /tmp/jsk_common_$$/jsk_*_msgs ."
- ROS_DISTRO=hydro BEFORE_SCRIPT="pwd; git clone http://github.com/jsk-ros-pkg/jsk_common_msgs"
- ROS_DISTRO=hydro USE_JENKINS="true"
- ROS_DISTRO=indigo BUILDER='not-compile'
- ROS_DISTRO=indigo BUILDER='not-compile' TRAVIS_REPO_SLUG=jsk-ros-pkg/jsk_travis
- ROS_DISTRO=indigo BUILDER='not-compile' TRAVIS_REPO_SLUG=jsk-ros-pkg/jsk_travis TRAVIS_BRANCH=master TRAVIS_COMMIT='' TRAVIS_PULL_REQUEST=''
- ROS_DISTRO=jade BUILDER='not-compile'
- ROS_DISTRO=jade BUILDER='not-compile' TRAVIS_REPO_SLUG=jsk-ros-pkg/jsk_travis
- ROS_DISTRO=jade BUILDER='not-compile' TRAVIS_REPO_SLUG=jsk-ros-pkg/jsk_travis TRAVIS_BRANCH=master TRAVIS_COMMIT='' TRAVIS_PULL_REQUEST=''
before_script:
- mkdir .travis; cp * .travis # need to copy, since directory starting from . is ignoreed by catkin build
- find . -name CATKIN_IGNORE -exec rm {} \;
Expand Down
2 changes: 1 addition & 1 deletion travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ function travis_time_end {
}


if [ "$ROS_DISTRO" == "indigo" -o "${USE_JENKINS}" == "true" ] && [ "$TRAVIS_JOB_ID" ]; then
if [ "$ROS_DISTRO" == "indigo" -o "$ROS_DISTRO" == "jade" -o "${USE_JENKINS}" == "true" ] && [ "$TRAVIS_JOB_ID" ]; then
sudo apt-get install -y -qq python-pip
sudo pip install python-jenkins
./.travis/travis_jenkins.py
Expand Down

0 comments on commit 58caf79

Please sign in to comment.