Merge topic 'ci-base-images' into release-3.21

53cb34cb23 ci: add freeglut to Debian and Fedora base images
b07253f754 ci: update keyserver URL

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6279

6 files changed, 8 insertions, 5 deletions

diff --git a/.gitlab/ci/docker/debian10-aarch64/install_deps.sh b/.gitlab/ci/docker/debian10-aarch64/install_deps.sh
index fea502e..f2ffcd6 100755
--- a/.gitlab/ci/docker/debian10-aarch64/install_deps.sh
+++ b/.gitlab/ci/docker/debian10-aarch64/install_deps.sh
@@ -27,6 +27,7 @@ apt-get install -y \
 apt-get install -y \
     alsa-utils \
     doxygen graphviz \
+    freeglut3-dev \
     gnutls-dev \
     libarchive-dev \
     libblas-dev \
diff --git a/.gitlab/ci/docker/debian10/install_deps.sh b/.gitlab/ci/docker/debian10/install_deps.sh
index 4bb03bc..14dc67d 100755
--- a/.gitlab/ci/docker/debian10/install_deps.sh
+++ b/.gitlab/ci/docker/debian10/install_deps.sh
@@ -27,6 +27,7 @@ apt-get install -y \
 apt-get install -y \
     alsa-utils \
     doxygen graphviz \
+    freeglut3-dev \
     gnutls-dev \
     libarchive-dev \
     libblas-dev \
diff --git a/.gitlab/ci/docker/debian10/install_rvm.sh b/.gitlab/ci/docker/debian10/install_rvm.sh
index 2bea511..75c5adc 100755
--- a/.gitlab/ci/docker/debian10/install_rvm.sh
+++ b/.gitlab/ci/docker/debian10/install_rvm.sh
@@ -8,7 +8,7 @@ apt-get install -y \
     gnupg2 \
     procps
 
-gpg2 --keyserver hkp://pool.sks-keyservers.net \
+gpg2 --keyserver hkps://keyserver.ubuntu.com \
      --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 \
                  7D2BAF1CF37B13E2069D6956105BD0E739499BDB
 
diff --git a/.gitlab/ci/docker/fedora34/install_deps.sh b/.gitlab/ci/docker/fedora34/install_deps.sh
index 1992373..878b5f8 100755
--- a/.gitlab/ci/docker/fedora34/install_deps.sh
+++ b/.gitlab/ci/docker/fedora34/install_deps.sh
@@ -51,6 +51,7 @@ dnf install --setopt=install_weak_deps=False -y \
     doxygen \
     expat-devel \
     fontconfig-devel \
+    freeglut-devel \
     freetype-devel \
     gdal-devel \
     gettext \
diff --git a/.gitlab/ci/docker/fedora34/install_rvm.sh b/.gitlab/ci/docker/fedora34/install_rvm.sh
index 6d4fa97..fca5104 100755
--- a/.gitlab/ci/docker/fedora34/install_rvm.sh
+++ b/.gitlab/ci/docker/fedora34/install_rvm.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-gpg2 --keyserver hkp://pool.sks-keyservers.net \
+gpg2 --keyserver hkps://keyserver.ubuntu.com \
      --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 \
                  7D2BAF1CF37B13E2069D6956105BD0E739499BDB
 
diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml
index 06b98cc..8ce795e 100644
--- a/.gitlab/os-linux.yml
+++ b/.gitlab/os-linux.yml
@@ -45,7 +45,7 @@
 ### Debian
 
 .debian10:
-    image: "kitware/cmake:ci-debian10-x86_64-2021-05-11"
+    image: "kitware/cmake:ci-debian10-x86_64-2021-06-28"
 
     variables:
         GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
@@ -60,7 +60,7 @@
         CMake_SKIP_INSTALL: 1
 
 .debian10_aarch64:
-    image: "kitware/cmake:ci-debian10-aarch64-2021-05-11"
+    image: "kitware/cmake:ci-debian10-aarch64-2021-06-28"
 
     variables:
         GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
@@ -69,7 +69,7 @@
 ### Fedora
 
 .fedora34:
-    image: "kitware/cmake:ci-fedora34-x86_64-2021-06-10"
+    image: "kitware/cmake:ci-fedora34-x86_64-2021-06-28"
 
     variables:
         GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes"