From 772fd18d81cf720ccbb8dfb59e4f8d96f5e22cdd Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sat, 31 Oct 2020 14:45:19 +0100 Subject: [PATCH] only use pytest-based compile_Marc test --- .gitlab-ci.yml | 6 +++--- PRIVATE | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 17728632d..acdf6d9de 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -109,7 +109,7 @@ Pytest_python: stage: python script: - cd $DAMASKROOT/python - - pytest --basetemp=/tmp/${CI_PIPELINE_ID}/python + - pytest --basetemp=/tmp/${CI_PIPELINE_ID}/python -v except: - master - release @@ -253,7 +253,7 @@ Pytest_grid: script: - module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel - cd pytest - - pytest -m 'not compile' --basetemp=/tmp/${CI_PIPELINE_ID}/fortran + - pytest -m 'not compile' --basetemp=/tmp/${CI_PIPELINE_ID}/fortran -k except: - master - release @@ -316,7 +316,7 @@ Marc_compileIfort: - module load $IntelMarc $HDF5Marc $MSC - Marc_compileIfort/test.py - cd pytest - - pytest -k 'compile and Marc' + - pytest -k 'compile and Marc' --basetemp=/tmp/${CI_PIPELINE_ID}/compile_Marc except: - master - release diff --git a/PRIVATE b/PRIVATE index 7e7452fe1..f1ab98fe9 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 7e7452fe11187cd816fccf83a947bd7ea7713586 +Subproject commit f1ab98fe98dc6a5c5f1d75d03e65a5defe147fed