From 1fd0ec99862025632ca870d747c2e57d87edb832 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Fri, 25 Sep 2020 08:15:22 +0200 Subject: [PATCH] start immediately with longest test --- .gitlab-ci.yml | 20 ++++++++++---------- PRIVATE | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 054e18ae2..4e83757e5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -239,6 +239,16 @@ Compile_Intel_Prepare: - release ################################################################################################### +Pytest_grid: + stage: grid + script: + - module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel + - cd pytest + - pytest + except: + - master + - release + Thermal: stage: grid script: Thermal/test.py @@ -304,16 +314,6 @@ Phenopowerlaw_singleSlip: - master - release -Pytest_grid: - stage: grid - script: - - module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel - - cd pytest - - pytest - except: - - master - - release - ################################################################################################### Marc_compileIfort: stage: compileMarc diff --git a/PRIVATE b/PRIVATE index ca6b52222..fe0a83c02 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit ca6b52222924fe23501c8cdeb0446b2cdecabd71 +Subproject commit fe0a83c023334167197dafeb6bf09d17574e2955