only use pytest-based compile_Marc test

This commit is contained in:
Martin Diehl 2020-10-31 14:45:19 +01:00
parent 8224122bb9
commit 772fd18d81
2 changed files with 4 additions and 4 deletions

View File

@ -109,7 +109,7 @@ Pytest_python:
stage: python stage: python
script: script:
- cd $DAMASKROOT/python - cd $DAMASKROOT/python
- pytest --basetemp=/tmp/${CI_PIPELINE_ID}/python - pytest --basetemp=/tmp/${CI_PIPELINE_ID}/python -v
except: except:
- master - master
- release - release
@ -253,7 +253,7 @@ Pytest_grid:
script: script:
- module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel - module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel
- cd pytest - cd pytest
- pytest -m 'not compile' --basetemp=/tmp/${CI_PIPELINE_ID}/fortran - pytest -m 'not compile' --basetemp=/tmp/${CI_PIPELINE_ID}/fortran -k
except: except:
- master - master
- release - release
@ -316,7 +316,7 @@ Marc_compileIfort:
- module load $IntelMarc $HDF5Marc $MSC - module load $IntelMarc $HDF5Marc $MSC
- Marc_compileIfort/test.py - Marc_compileIfort/test.py
- cd pytest - cd pytest
- pytest -k 'compile and Marc' - pytest -k 'compile and Marc' --basetemp=/tmp/${CI_PIPELINE_ID}/compile_Marc
except: except:
- master - master
- release - release

@ -1 +1 @@
Subproject commit 7e7452fe11187cd816fccf83a947bd7ea7713586 Subproject commit f1ab98fe98dc6a5c5f1d75d03e65a5defe147fed