From 01efec260274db0bc7162f54a624087ccf707854 Mon Sep 17 00:00:00 2001 From: Fumio KANEHIRO Date: Wed, 12 Jun 2019 10:17:49 +0900 Subject: [PATCH 1/3] [.travis.sh] update dpkg to install rosdistro --- .travis.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.sh b/.travis.sh index c6b63717f22..97182fcd2f7 100755 --- a/.travis.sh +++ b/.travis.sh @@ -61,6 +61,7 @@ echo "Testing branch $TRAVIS_BRANCH of $REPOSITORY_NAME" sudo -E sh -c 'echo "deb http://packages.ros.org/ros-shadow-fixed/ubuntu ${DISTRO} main" > /etc/apt/sources.list.d/ros-latest.list' wget http://packages.ros.org/ros.key -O - | sudo apt-key add - sudo apt-get update -qq +sudo apt-get install dpkg -y # for https://github.com/ros/rosdistro/issues/19481 travis_time_end travis_time_start disable_ssl From 97e62c7464bbdeaea85da4a64781ce999f80d563 Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Wed, 12 Jun 2019 14:47:06 +0900 Subject: [PATCH 2/3] update ros repositories c.f https://discourse.ros.org/t/new-gpg-keys-deployed-for-packages-ros-org/9454 --- .travis.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.sh b/.travis.sh index 97182fcd2f7..5abde71915a 100755 --- a/.travis.sh +++ b/.travis.sh @@ -58,7 +58,8 @@ travis_time_start setup_ros export CI_SOURCE_PATH=$(pwd) export REPOSITORY_NAME=${PWD##*/} echo "Testing branch $TRAVIS_BRANCH of $REPOSITORY_NAME" -sudo -E sh -c 'echo "deb http://packages.ros.org/ros-shadow-fixed/ubuntu ${DISTRO} main" > /etc/apt/sources.list.d/ros-latest.list' +sudo -E sh -c 'echo "deb http://packages.ros.org/ros-testing/ubuntu ${DISTRO} main" > /etc/apt/sources.list.d/ros-latest.list' +sudo -E sh -c 'echo "deb http://snapshots.ros.org/hydro/final/ubuntu ${DISTRO} main" > /etc/apt/sources.list.d/ros-latest.list' wget http://packages.ros.org/ros.key -O - | sudo apt-key add - sudo apt-get update -qq sudo apt-get install dpkg -y # for https://github.com/ros/rosdistro/issues/19481 From 1d334ba28128e77b2b3d9a7118c2acb479b9cb09 Mon Sep 17 00:00:00 2001 From: eisoku9618 Date: Wed, 12 Jun 2019 23:16:17 +0900 Subject: [PATCH 3/3] set keyring for snapshots.ros.org for EOL distros --- .travis.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.travis.sh b/.travis.sh index 5abde71915a..76799f8904f 100755 --- a/.travis.sh +++ b/.travis.sh @@ -58,9 +58,14 @@ travis_time_start setup_ros export CI_SOURCE_PATH=$(pwd) export REPOSITORY_NAME=${PWD##*/} echo "Testing branch $TRAVIS_BRANCH of $REPOSITORY_NAME" -sudo -E sh -c 'echo "deb http://packages.ros.org/ros-testing/ubuntu ${DISTRO} main" > /etc/apt/sources.list.d/ros-latest.list' -sudo -E sh -c 'echo "deb http://snapshots.ros.org/hydro/final/ubuntu ${DISTRO} main" > /etc/apt/sources.list.d/ros-latest.list' -wget http://packages.ros.org/ros.key -O - | sudo apt-key add - +if [ $ROS_DISTRO == "hydro" ] # hydro is one of EOL distros so we cannot use packages.ros.org +then + sudo -E sh -c 'echo "deb http://snapshots.ros.org/${ROS_DISTRO}/final/ubuntu ${DISTRO} main" > /etc/apt/sources.list.d/ros-latest.list' + sudo apt-key adv --keyserver 'hkp://keyserver.ubuntu.com:80' --recv-key AD19BAB3CBF125EA +else + sudo -E sh -c 'echo "deb http://packages.ros.org/ros-shadow-fixed/ubuntu ${DISTRO} main" > /etc/apt/sources.list.d/ros-latest.list' + wget http://packages.ros.org/ros.key -O - | sudo apt-key add - +fi sudo apt-get update -qq sudo apt-get install dpkg -y # for https://github.com/ros/rosdistro/issues/19481