Kaynağa Gözat

Merge topic 'ci-ctest-update' into release-3.21

3b581ab3aa ci: Enable CTest.Update{CVS,SVN,HG} tests

Acked-by: Kitware Robot <[email protected]>
Acked-by: Ben Boeckel <[email protected]>
Merge-request: !6596
Brad King 4 yıl önce
ebeveyn
işleme
15f405cdf1

+ 6 - 0
.gitlab/ci/docker/debian10-aarch64/install_deps.sh

@@ -23,6 +23,12 @@ apt-get install -y \
 apt-get install -y \
     jq
 
+# Packages needed to test CTest.
+apt-get install -y \
+    cvs \
+    subversion \
+    mercurial
+
 # Packages needed to test find modules.
 apt-get install -y \
     alsa-utils \

+ 6 - 0
.gitlab/ci/docker/debian10/install_deps.sh

@@ -23,6 +23,12 @@ apt-get install -y \
 apt-get install -y \
     jq
 
+# Packages needed to test CTest.
+apt-get install -y \
+    cvs \
+    subversion \
+    mercurial
+
 # Packages needed to test find modules.
 apt-get install -y \
     alsa-utils \

+ 5 - 0
.gitlab/ci/docker/fedora34/install_deps.sh

@@ -36,6 +36,11 @@ dnf install --setopt=install_weak_deps=False -y \
     jq \
     which
 
+# Packages needed to test CTest.
+dnf install --setopt=install_weak_deps=False -y \
+    subversion \
+    mercurial
+
 # Packages needed to test CPack.
 dnf install --setopt=install_weak_deps=False -y \
     rpm-build

+ 3 - 3
.gitlab/os-linux.yml

@@ -45,7 +45,7 @@
 ### Debian
 
 .debian10:
-    image: "kitware/cmake:ci-debian10-x86_64-2021-06-28"
+    image: "kitware/cmake:ci-debian10-x86_64-2021-10-05"
 
     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-06-28"
+    image: "kitware/cmake:ci-debian10-aarch64-2021-10-05"
 
     variables:
         GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
@@ -69,7 +69,7 @@
 ### Fedora
 
 .fedora34:
-    image: "kitware/cmake:ci-fedora34-x86_64-2021-06-28"
+    image: "kitware/cmake:ci-fedora34-x86_64-2021-10-05"
 
     variables:
         GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes"