From 25371510a5fc748e30cd5ad4f5594a62cd80a00a Mon Sep 17 00:00:00 2001 From: Matthias Hochsteger Date: Thu, 29 Aug 2019 17:41:22 +0200 Subject: [PATCH] Don't run slow tests in docker --- .gitlab-ci.yml | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4bc6ed1a..6fe2c47b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -85,7 +85,14 @@ build_ubuntu_debug: script: - docker build -t netgen_${CI_PIPELINE_ID}:${UBUNTU_VERSION} -f tests/dockerfile . - rm -f netgen_${CI_PIPELINE_ID}_$UBUNTU_VERSION.id - - docker run --cidfile netgen_${CI_PIPELINE_ID}_${UBUNTU_VERSION}.id -e CCACHE_DIR=/ccache -v /mnt/ccache:/ccache netgen_${CI_PIPELINE_ID}:${UBUNTU_VERSION} bash /root/src/netgen/tests/build_debug.sh + - >- + docker run + --cidfile netgen_${CI_PIPELINE_ID}_${UBUNTU_VERSION}.id + -e CCACHE_DIR=/ccache + -e RUN_SLOW_TESTS=${RUN_SLOW_TESTS} + -v /mnt/ccache:/ccache + netgen_${CI_PIPELINE_ID}:${UBUNTU_VERSION} + bash /root/src/netgen/tests/build_debug.sh - docker commit `cat netgen_${CI_PIPELINE_ID}_${UBUNTU_VERSION}.id` netgen_${CI_PIPELINE_ID}_installed:${UBUNTU_VERSION} - rm netgen_${CI_PIPELINE_ID}_${UBUNTU_VERSION}.id @@ -95,7 +102,14 @@ build_ubuntu_mpi: script: - docker build -t netgen_mpi_${CI_PIPELINE_ID}:${UBUNTU_VERSION} -f tests/dockerfile_mpi . - rm -f netgen_mpi_${CI_PIPELINE_ID}_$UBUNTU_VERSION.id_mpi - - docker run --cidfile netgen_mpi_${CI_PIPELINE_ID}_${UBUNTU_VERSION}.id -e CCACHE_DIR=/ccache -v /mnt/ccache:/ccache netgen_mpi_${CI_PIPELINE_ID}:${UBUNTU_VERSION} bash /root/src/netgen/tests/build_mpi.sh + - >- + docker run>- + --cidfile netgen_mpi_${CI_PIPELINE_ID}_${UBUNTU_VERSION}.id>- + -e CCACHE_DIR=/ccache + -e RUN_SLOW_TESTS=${RUN_SLOW_TESTS} + -v /mnt/ccache:/ccache + netgen_mpi_${CI_PIPELINE_ID}:${UBUNTU_VERSION} + bash /root/src/netgen/tests/build_mpi.sh - docker commit `cat netgen_mpi_${CI_PIPELINE_ID}_${UBUNTU_VERSION}.id` netgen_mpi_${CI_PIPELINE_ID}_installed:${UBUNTU_VERSION} - rm netgen_mpi_${CI_PIPELINE_ID}_${UBUNTU_VERSION}.id @@ -105,6 +119,7 @@ test_ubuntu: script: - >- docker run + -e RUN_SLOW_TESTS=${RUN_SLOW_TESTS} -e NETGENDIR=/opt/netgen/bin -e PYTHONPATH=/opt/netgen/lib/python3/dist-packages netgen_${CI_PIPELINE_ID}_installed:${UBUNTU_VERSION} @@ -116,6 +131,7 @@ test_ubuntu_mpi: script: - >- docker run + -e RUN_SLOW_TESTS=${RUN_SLOW_TESTS} -e NETGENDIR=/opt/netgen/bin -e PYTHONPATH=/opt/netgen/lib/python3/dist-packages netgen_mpi_${CI_PIPELINE_ID}_installed:${UBUNTU_VERSION}