diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 16f62177..0b6fbd36 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -91,11 +91,11 @@ build_ubuntu_mpi: <<: *ubuntu stage: build script: - - docker build -t netgen_${CI_BUILD_REF_NAME}:${UBUNTU_VERSION} -f tests/dockerfile_mpi . - - rm -f netgen_${CI_BUILD_REF_NAME}_$UBUNTU_VERSION.id_mpi - - docker run --cidfile netgen_${CI_BUILD_REF_NAME}_${UBUNTU_VERSION}.id -e CCACHE_DIR=/ccache -v /mnt/ccache:/ccache netgen_${CI_BUILD_REF_NAME}:${UBUNTU_VERSION} bash /root/src/netgen/tests/build_mpi.sh - - docker commit `cat netgen_${CI_BUILD_REF_NAME}_${UBUNTU_VERSION}.id` netgen_${CI_BUILD_REF_NAME}_installed:${UBUNTU_VERSION} - - rm netgen_${CI_BUILD_REF_NAME}_${UBUNTU_VERSION}.id + - docker build -t netgen_mpi_${CI_BUILD_REF_NAME}:${UBUNTU_VERSION} -f tests/dockerfile_mpi . + - rm -f netgen_mpi_${CI_BUILD_REF_NAME}_$UBUNTU_VERSION.id_mpi + - docker run --cidfile netgen_mpi_${CI_BUILD_REF_NAME}_${UBUNTU_VERSION}.id -e CCACHE_DIR=/ccache -v /mnt/ccache:/ccache netgen_mpi_${CI_BUILD_REF_NAME}:${UBUNTU_VERSION} bash /root/src/netgen/tests/build_mpi.sh + - docker commit `cat netgen_mpi_${CI_BUILD_REF_NAME}_${UBUNTU_VERSION}.id` netgen_mpi_${CI_BUILD_REF_NAME}_installed:${UBUNTU_VERSION} + - rm netgen_mpi_${CI_BUILD_REF_NAME}_${UBUNTU_VERSION}.id test_ubuntu: <<: *ubuntu @@ -116,7 +116,7 @@ test_ubuntu_mpi: docker run -e NETGENDIR=/opt/netgen/bin -e PYTHONPATH=/opt/netgen/lib/python3/dist-packages - netgen_${CI_BUILD_REF_NAME}_installed:${UBUNTU_VERSION}_mpi + netgen_mpi_${CI_BUILD_REF_NAME}_installed:${UBUNTU_VERSION} bash -c 'cd /root/build/netgen && make test_netgen ARGS="-V"' # cpp guideline checks