diff --git a/.travis b/.travis index a2a59373..74e96892 160000 --- a/.travis +++ b/.travis @@ -1 +1 @@ -Subproject commit a2a59373e3a98d064dbd11452179328bfc110e60 +Subproject commit 74e968928601f613b2cec821c1a5975baafc1127 diff --git a/.travis.rosinstall b/.travis.rosinstall index bb55c185..4a4fccca 100644 --- a/.travis.rosinstall +++ b/.travis.rosinstall @@ -28,6 +28,3 @@ - git: uri: https://github.com/start-jsk/rtmros_common local-name: rtm-ros-robotics/rtmros_common -- git: - uri: https://github.com/start-jsk/rtmros_tutorials - local-name: rtm-ros-robotics/rtmros_tutorials diff --git a/.travis.yml b/.travis.yml index 983fc83b..84eae874 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,13 +17,14 @@ env: - CATKIN_PARALLEL_TEST_JOBS='-p1' - ROS_PARALLEL_JOBS="-j2" - ROS_PARALLEL_TEST_JOBS='-j1' + - USE_JENKINS=true matrix: - ROS_DISTRO=indigo USE_DEB=true - ROS_DISTRO=indigo USE_DEB=false NOT_TEST_INSTALL=true - ROS_DISTRO=indigo USE_DEB=true NOT_TEST_INSTALL=true INSTALL_SRC_SECURE="git@github.com:start-jsk/rtmros_hrp2" TEST_PKGS_SECURE="jsk_hrp2_ros_bridge" matrix: - allow_failures: - - env: ROS_DISTRO=indigo USE_DEB=false NOT_TEST_INSTALL=true + # allow_failures: + # - env: ROS_DISTRO=indigo USE_DEB=false NOT_TEST_INSTALL=true notifications: email: recipients: @@ -35,7 +36,8 @@ notifications: on_success: always #[always|never|change] # default: change on_failure: always #[always|never|change] # default: always before_script: - - if [ "${TRAVIS_SECURE_ENV_VARS}" == "true" ]; then openssl aes-256-cbc -K $encrypted_0083437bf214_key -iv $encrypted_0083437bf214_iv -in .secrets.tar.enc -out .secrets.tar -d; tar -C ~/ -xvf .secrets.tar; export INSTALL_SRC="$INSTALL_SRC $INSTALL_SRC_SECURE"; export TEST_PKGS="$TEST_PKGS $TEST_PKGS_SECURE"; fi + - if [ "${INSTALL_SRC_SECURE}" != "" ]; then export INSTALL_SRC="$INSTALL_SRC $INSTALL_SRC_SECURE"; fi # works only with jenkins + - if [ "${TEST_PKGS_SECURE}" != "" ]; then export TEST_PKGS="$TEST_PKGS $TEST_PKGS_SECURE"; fi # works only with jenkins - export REPOSITORY_NAME=`basename $PWD` - - if [ "${INSTALL_SRC}" != "" ] ;then sudo apt-get install python-yaml; rm .travis.rosinstall; for src in $INSTALL_SRC; do name=`basename $src`; python -c "import yaml;print yaml.dump([{'git':{'uri':'$src','local-name':'$name'}}], default_flow_style=False)" >> .travis.rosinstall; done; cat .travis.rosinstall; export USE_DEB=false; fi; # set USE_DEB false to enable .travis.rosinstall + - if [ "${INSTALL_SRC}" != "" ]; then export BEFORE_SCRIPT="sudo apt-get install python-yaml; $(for src in $INSTALL_SRC; do name=`basename $src`; echo "python -c \"import yaml;print yaml.dump([{\\\"git\\\":{\\\"uri\\\":\\\"$src\\\",\\\"local-name\\\":\\\"$name\\\"}}], default_flow_style=False)\" >> .rosinstall;"; done) ls -al; cat .rosinstall; wstool update"; fi script: source .travis/travis.sh