diff options
| author | Brad King <brad.king@kitware.com> | 2021-05-21 16:32:39 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-05-21 16:37:37 (GMT) |
| commit | 2bc0708c39470d6ce612047d9864c1bbf2e67304 (patch) | |
| tree | 33df12fc1ae03b46300742bfea71a71e106d1ab1 /.gitlab | |
| parent | ef25359edac842614029f0cceb040f9b65cc817c (diff) | |
| download | CMake-2bc0708c39470d6ce612047d9864c1bbf2e67304.zip CMake-2bc0708c39470d6ce612047d9864c1bbf2e67304.tar.gz CMake-2bc0708c39470d6ce612047d9864c1bbf2e67304.tar.bz2 | |
ci: Switch to MPICH in Fedora jobs
The OpenMPI package in Fedora 34 requires a CPU with AVX instructions.
Some of our CI machines do not have them, and so fail the FindMPI.Test
test with `SIGILL`. Switch to MPICH. Since we test with OpenMPI on the
Debian jobs, this covers more MPI vendors anyway.
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/env_fedora34_makefiles.cmake | 2 | ||||
| -rw-r--r-- | .gitlab/os-linux.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab/ci/env_fedora34_makefiles.cmake b/.gitlab/ci/env_fedora34_makefiles.cmake index 1d0efa7..aa84e23 100644 --- a/.gitlab/ci/env_fedora34_makefiles.cmake +++ b/.gitlab/ci/env_fedora34_makefiles.cmake @@ -1,2 +1,2 @@ set(ENV{MY_RUBY_HOME} "/usr/local/rvm/rubies/ruby-2.7.0") -set(ENV{PATH} "/usr/lib64/openmpi/bin:$ENV{PATH}") +set(ENV{PATH} "/usr/lib64/mpich/bin:$ENV{PATH}") diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index 1bf4098..dcaa643 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -69,7 +69,7 @@ ### Fedora .fedora34: - image: "kitware/cmake:ci-fedora34-x86_64-2021-05-10" + image: "kitware/cmake:ci-fedora34-x86_64-2021-05-21" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes" |