From 436037ef5491c3d2c7752d4ac960e161b8084602 Mon Sep 17 00:00:00 2001 From: Shun Hasegawa Date: Fri, 13 Dec 2019 19:49:07 +0900 Subject: [PATCH 1/6] Update .travis to jsk_travis 0.5.7 to avoid authentication failure of jenkins --- .travis | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis b/.travis index a2a59373..74e96892 160000 --- a/.travis +++ b/.travis @@ -1 +1 @@ -Subproject commit a2a59373e3a98d064dbd11452179328bfc110e60 +Subproject commit 74e968928601f613b2cec821c1a5975baafc1127 From a90950403d0ff16f4c4b60e865d46e3f8ac8778e Mon Sep 17 00:00:00 2001 From: Shun Hasegawa Date: Sat, 14 Dec 2019 14:51:49 +0900 Subject: [PATCH 2/6] Remove rtmros_tutorials from .travis.rosinstall Target package itself should be excluded from .travis.rosinstall --- .travis.rosinstall | 3 --- 1 file changed, 3 deletions(-) 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 From 92957fed338e38108aa44f49c37554c6f52fbd85 Mon Sep 17 00:00:00 2001 From: Shun Hasegawa Date: Sat, 14 Dec 2019 15:31:00 +0900 Subject: [PATCH 3/6] Remove USE_DEB=false test from allow_failures because it passes now --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 983fc83b..c6010ffe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,8 +22,8 @@ env: - 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: From 97e3452d7f4f84f69a00dcde749ba6bca8c1a8d4 Mon Sep 17 00:00:00 2001 From: Shun Hasegawa Date: Sat, 14 Dec 2019 16:20:37 +0900 Subject: [PATCH 4/6] Explicitly use jenkins --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index c6010ffe..a7c405a5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,7 @@ 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 From 4c34577ae47bfc252953542d38119741ca775057 Mon Sep 17 00:00:00 2001 From: Shun Hasegawa Date: Sat, 14 Dec 2019 16:57:47 +0900 Subject: [PATCH 5/6] Fix to download rtmros_hrp2 on jenkins --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a7c405a5..bc04c8e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,5 +38,5 @@ notifications: 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 - 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 From 1860b812ae07f36038d26683e2aff5bc7a1b3cdb Mon Sep 17 00:00:00 2001 From: Shun Hasegawa Date: Sat, 14 Dec 2019 16:59:15 +0900 Subject: [PATCH 6/6] Download rtmros_hrp2 even in pull request build thanks to jenkins --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bc04c8e3..84eae874 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,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 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