diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8583c09c8..d24633468 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -181,13 +181,13 @@ open-source: script: - module load ${COMPILER_INTEL} ${MPI_INTEL} ${PETSC_INTEL} - cd PRIVATE/testing/pytest - - pytest -k 'not compile and not Marc' --basetemp ${TESTROOT}/open-source -v + - pytest -k 'not compile and not Marc' -m 'not cifail' --basetemp ${TESTROOT}/open-source -v Marc: stage: fortran script: - cd PRIVATE/testing/pytest - - pytest -k 'not compile and Marc' --damask-root=${TESTROOT} --basetemp ${TESTROOT}/Marc -v + - pytest -k 'not compile and Marc' -m 'not cifail' --damask-root=${TESTROOT} --basetemp ${TESTROOT}/Marc -v # Needs closer look # Phenopowerlaw_singleSlip: diff --git a/PRIVATE b/PRIVATE index d27f3df92..fc04b9ef6 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit d27f3df921aee300d74ab69d535ea43ff251c47f +Subproject commit fc04b9ef621161e60a2f8b72bfa8c99e77687c71