From 26b4cbcf93abf08cb9c7eb5a0173d066abd404b4 Mon Sep 17 00:00:00 2001
From: Ben Boeckel <ben.boeckel@kitware.com>
Date: Thu, 11 Jun 2020 11:00:30 -0400
Subject: gitlab-ci: move Makefiles Linux tests to use the package

---
 .gitlab-ci.yml                                | 47 ++++++++++++++++-----------
 .gitlab/ci/configure_fedora31_makefiles.cmake |  2 +-
 2 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3447964..b881796 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -378,6 +378,23 @@
 
     interruptible: true
 
+.cmake_test_unix_package: &cmake_test_unix_package
+    stage: test-ext
+
+    script:
+        - *before_script_unix
+        # Make the CMake package available.
+        - mkdir -p build/install
+        - tar -C build/install --strip-components=1 -xzf build/cmake-*-Linux-x86_64.tar.gz
+        - .gitlab/ci/sccache.sh
+        # Allow the server to already be running.
+        - "sccache --start-server || :"
+        - sccache --show-stats
+        - "$LAUNCHER build/install/bin/ctest --output-on-failure -V -S .gitlab/ci/ctest_test_external.cmake"
+        - sccache --show-stats
+
+    interruptible: true
+
 .cmake_test_unix_external: &cmake_test_unix_external
     stage: test-ext
 
@@ -434,6 +451,17 @@ build:centos6-release:
         - *linux_builder_tags
     rules: *manual_rules_settings
 
+test:fedora31-makefiles:
+    <<:
+        - *fedora31_makefiles
+        - *cmake_test_unix_package
+        - *linux_builder_tags_qt
+    rules: *rules_settings
+    dependencies:
+        - build:centos6-release
+    needs:
+        - build:centos6-release
+
 build:fedora31-ninja:
     <<:
         - *fedora31_ninja
@@ -465,25 +493,6 @@ test:fedora31-ninja-multi:
     needs:
         - test:fedora31-ninja
 
-build:fedora31-makefiles:
-    <<:
-        - *fedora31_makefiles
-        - *cmake_build_unix
-        - *cmake_build_artifacts
-        - *linux_builder_tags_qt
-    rules: *manual_rules_settings
-
-test:fedora31-makefiles:
-    <<:
-        - *fedora31_makefiles
-        - *cmake_test_unix
-        - *linux_builder_tags_qt
-    rules: *rules_settings
-    dependencies:
-        - build:fedora31-makefiles
-    needs:
-        - build:fedora31-makefiles
-
 build:macos-ninja:
     <<:
         - *macos_ninja
diff --git a/.gitlab/ci/configure_fedora31_makefiles.cmake b/.gitlab/ci/configure_fedora31_makefiles.cmake
index 74768b7..20863a2 100644
--- a/.gitlab/ci/configure_fedora31_makefiles.cmake
+++ b/.gitlab/ci/configure_fedora31_makefiles.cmake
@@ -1 +1 @@
-include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora31_common.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake")
-- 
cgit v0.12