ci: remove ISPC from the Fedora CI image

Revert commit 5ece12b7e4 (gitlab-ci: add ISPC to the Fedora CI image,
2020-08-18, v3.19.0-rc1~244^2).  Later we will download ISPC in specific
jobs.

Update a `RunCMake.NinjaMultiConfig` test expectation to account for
a change to the Qt deployed on Fedora 36.

6 files changed, 1 insertions, 21 deletions

diff --git a/.gitlab/ci/configure_fedora36_makefiles.cmake b/.gitlab/ci/configure_fedora36_makefiles.cmake
index 9dc5ca982c..25df029bf8 100644
--- a/.gitlab/ci/configure_fedora36_makefiles.cmake
+++ b/.gitlab/ci/configure_fedora36_makefiles.cmake
@@ -73,7 +73,6 @@ set(CMake_TEST_Fortran_SUBMODULES "ON" CACHE BOOL "")
 set(CMake_TEST_IPO_WORKS_C "ON" CACHE BOOL "")
 set(CMake_TEST_IPO_WORKS_CXX "ON" CACHE BOOL "")
 set(CMake_TEST_IPO_WORKS_Fortran "ON" CACHE BOOL "")
-set(CMake_TEST_ISPC "ON" CACHE STRING "")
 set(CMake_TEST_Qt5 "ON" CACHE BOOL "")
 set(CMake_TEST_UseSWIG "ON" CACHE BOOL "")
 
diff --git a/.gitlab/ci/configure_fedora36_ninja.cmake b/.gitlab/ci/configure_fedora36_ninja.cmake
index 7e335132bb..7d5105dac3 100644
--- a/.gitlab/ci/configure_fedora36_ninja.cmake
+++ b/.gitlab/ci/configure_fedora36_ninja.cmake
@@ -1,4 +1,3 @@
-set(CMake_TEST_ISPC "ON" CACHE STRING "")
 set(CMake_TEST_GUI "ON" CACHE BOOL "")
 
 # "Release" flags without "-DNDEBUG" so we get assertions.
diff --git a/.gitlab/ci/configure_fedora36_ninja_multi.cmake b/.gitlab/ci/configure_fedora36_ninja_multi.cmake
index efb4b846f4..20863a2fb0 100644
--- a/.gitlab/ci/configure_fedora36_ninja_multi.cmake
+++ b/.gitlab/ci/configure_fedora36_ninja_multi.cmake
@@ -1,2 +1 @@
-set(CMake_TEST_ISPC "ON" CACHE STRING "")
 include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake")
diff --git a/.gitlab/ci/docker/fedora36/Dockerfile b/.gitlab/ci/docker/fedora36/Dockerfile
index cf6ded9c3f..26f8e3eea8 100644
--- a/.gitlab/ci/docker/fedora36/Dockerfile
+++ b/.gitlab/ci/docker/fedora36/Dockerfile
@@ -10,9 +10,6 @@ MAINTAINER Ben Boeckel <ben.boeckel@kitware.com>
 COPY install_deps.sh /root/install_deps.sh
 RUN sh /root/install_deps.sh
 
-COPY install_ispc.sh /root/install_ispc.sh
-RUN sh /root/install_ispc.sh
-
 COPY --from=rvm-build /root/rvm.tar /root/rvm.tar
 RUN tar -C /usr/local -xf /root/rvm.tar \
  && rm /root/rvm.tar
diff --git a/.gitlab/ci/docker/fedora36/install_ispc.sh b/.gitlab/ci/docker/fedora36/install_ispc.sh
deleted file mode 100755
index fdc14b5c11..0000000000
--- a/.gitlab/ci/docker/fedora36/install_ispc.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-
-readonly version="1.13.0"
-readonly sha256sum="8ab1189bd5db596b3eee9d9465d3528b6626a7250675d67102761bb0d284cd21"
-
-readonly filename="ispc-v$version-linux"
-readonly tarball="$filename.tar.gz"
-
-echo "$sha256sum  $tarball" > ispc.sha256sum
-curl -OL "https://github.com/ispc/ispc/releases/download/v$version/$tarball"
-sha256sum --check ispc.sha256sum
-tar --strip-components=1 -C /usr/local -xf "$tarball" "$filename/bin/ispc"
diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml
index a822d9420e..0b2d382e81 100644
--- a/.gitlab/os-linux.yml
+++ b/.gitlab/os-linux.yml
@@ -69,7 +69,7 @@
 ### Fedora
 
 .fedora36:
-    image: "kitware/cmake:ci-fedora36-x86_64-2022-05-17"
+    image: "kitware/cmake:ci-fedora36-x86_64-2022-06-06"
 
     variables:
         GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes"