From 4822c855840fa3b735392e4630c24a9c8636f8fc Mon Sep 17 00:00:00 2001
From: Miguel Prada <miguel.prada@tecnalia.com>
Date: Wed, 3 Apr 2019 10:03:13 +0200
Subject: [PATCH] Retrieve ROS repository GPG keys through port 80

Default port for hkp service is blocked by our firewall and trying this adds
around 2 minutes per job until a timeout is triggered and the alternate method
of retrieving the key using wget is used.
---
 .gitlab-industrial-ci-kinetic-no-rosinstall.yml   | 1 +
 .gitlab-industrial-ci-kinetic-with-rosinstall.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
index 2c5ecf6..21693bf 100644
--- a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
@@ -28,6 +28,7 @@ before_script:
     DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel"
     BEFORE_SCRIPT: "wget -q -O - https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/ci_run_entry_points.sh | bash"
     CATKIN_CONFIG: '--cmake-args -DCMAKE_CXX_FLAGS=-Wno-ignored-attributes -Wno-int-in-bool-context --'
+    APTKEY_STORE_SKS: "hkp://ha.pool.sks-keyservers.net:80"
   when: always
 
 industrial_ci_kinetic:
diff --git a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
index c63dc7f..823d2cd 100644
--- a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
@@ -30,6 +30,7 @@ before_script:
     DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel"
     BEFORE_SCRIPT: "wget -q -O - https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/ci_run_entry_points.sh | bash"
     CATKIN_CONFIG: '--cmake-args -DCMAKE_CXX_FLAGS=-Wno-ignored-attributes -Wno-int-in-bool-context --'
+    APTKEY_STORE_SKS: "hkp://ha.pool.sks-keyservers.net:80"
   when: always
 
 industrial_ci_kinetic:
-- 
GitLab