Commit 9b7c9078 authored by Ben Boeckel's avatar Ben Boeckel
Browse files

gitlab-ci: use the RHEL8 container for ICC builds

parent ecc4ffb8
......@@ -62,25 +62,25 @@ test:fedora33-static-mpi-offscreen-osmesa-python:
needs:
- build:fedora33-static-mpi-offscreen-osmesa-python
build:fedora31-shared-icc-mpi-python:
build:rhel8-shared-icc-mpi-python:
extends:
- .fedora31_shared_icc_mpi_python
- .rhel8_shared_icc_mpi_python
- .cmake_build_linux
- .linux_builder_tags
- .cmake_build_artifacts
- .run_manually
test:fedora31-shared-icc-mpi-python:
test:rhel8-shared-icc-mpi-python:
extends:
- .fedora31_shared_icc_mpi_python
- .rhel8_shared_icc_mpi_python
- .cmake_test_linux
- .linux_tester_tags
- .cmake_test_artifacts
- .run_automatically
dependencies:
- build:fedora31-shared-icc-mpi-python
- build:rhel8-shared-icc-mpi-python
needs:
- build:fedora31-shared-icc-mpi-python
- build:rhel8-shared-icc-mpi-python
build:fedora33-shared-debug-mpi-python-qt:
extends:
......
......@@ -3,7 +3,7 @@
{
"group": "master",
"site": "gitlab-ci",
"buildname": "[fedora31_shared_icc_mpi_python]"
"buildname": "[rhel8_shared_icc_mpi_python]"
},
{
"group": "master",
......
set(MPI_PREFLAGS "--mca orte_base_help_aggregate 0" CACHE STRING "")
include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora31.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_rhel8.cmake")
......@@ -24,11 +24,9 @@
extends: .linux
image: "kitware/paraview:ci-fedora33-20210323"
.fedora31_icc:
.rhel8_icc:
extends: .linux
# XXX(icc): See note below about git-lfs. That can be removed once this
# image contains git-lfs in it.
image: "kitware/paraview:ci-fedora31-icc-20201014"
image: "kitware/paraview:ci-rhel8-icc-20210323"
variables:
CC: icc
......@@ -49,13 +47,12 @@
OMPI_ALLOW_RUN_AS_ROOT_CONFIRM: 1
MODULES: mpi/openmpi-x86_64
.fedora31_shared_icc_mpi_python:
.rhel8_shared_icc_mpi_python:
extends:
- .fedora31_icc
- .fedora_openmpi_addon
- .rhel8_icc
variables:
CMAKE_CONFIGURATION: fedora31_shared_icc_mpi_python
CMAKE_CONFIGURATION: rhel8_shared_icc_mpi_python
.fedora33_static_mpi_offscreen_osmesa_python:
extends:
......@@ -140,9 +137,6 @@
- cmake --version
- ninja --version
- doxygen --version
# XXX(icc): The icc container lacks git-lfs. A rebuild of the container
# will be necessary.
- '[ "$CC" = "icc" ] && dnf install --setopt=install_weak_deps=False -y git-lfs'
- "git submodule update --init --recursive || :"
- git submodule foreach --recursive cmake -P "$PWD/.gitlab/ci/fetch_submodule.cmake"
- git submodule sync --recursive
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment