From d5b80fe29e173fed5069f1099ff93de5a37427ae Mon Sep 17 00:00:00 2001
From: Miguel Prada <miguel.prada@tecnalia.com>
Date: Thu, 4 Apr 2019 09:29:20 +0200
Subject: [PATCH] Revert "Retrieve ROS repository GPG keys through port 80"
This reverts commit 4822c855840fa3b735392e4630c24a9c8636f8fc.
Apparently the port used by hkp is no longer blocked by the corporate firewall.
---
.gitlab-industrial-ci-kinetic-no-rosinstall.yml | 1 -
.gitlab-industrial-ci-kinetic-with-rosinstall.yml | 1 -
2 files changed, 2 deletions(-)
diff --git a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
index 21693bf..2c5ecf6 100644
--- a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
@@ -28,7 +28,6 @@ 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 823d2cd..c63dc7f 100644
--- a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
@@ -30,7 +30,6 @@ 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