Skip to content

Commit eeb36bd

Browse files
committed
Merge branch '485-run-full-test-suite-again' into 'development'
run full test suite Closes #485 See merge request damask/DAMASK!1044
2 parents 55cab04 + 2229988 commit eeb36bd

File tree

2 files changed

+11
-22
lines changed

2 files changed

+11
-22
lines changed

.gitlab-ci.yml

+10-21
Original file line numberDiff line numberDiff line change
@@ -203,12 +203,12 @@ unittest_oneAPI_PERFORMANCE:
203203
.compile_grid:
204204
extends: .compile
205205
script:
206-
- python -m pytest -k 'compile and grid'
206+
- python -m pytest -v -k 'compile and grid'
207207

208208
.compile_mesh:
209209
extends: .compile
210210
script:
211-
- python -m pytest -k 'compile and mesh'
211+
- python -m pytest -v -k 'compile and mesh'
212212

213213
grid_GCC:
214214
extends: .compile_grid
@@ -233,7 +233,7 @@ grid_oneAPI:
233233
# https://community.intel.com/t5/Intel-oneAPI-Math-Kernel-Library/Floating-point-exception-in-dgeev/td-p/1665868
234234
- sed -i '/set (DEBUG_FLAGS "${DEBUG_FLAGS} -fpe-all=0/d' ../../cmake/Compiler-IntelLLVM.cmake
235235
- sed -i 's/FP_TRAP_ON/FP_TRAP_OFF/g' ../../src/parallelization.f90
236-
- python -m pytest -k 'compile and grid'
236+
- python -m pytest -v -k 'compile and grid'
237237

238238
mesh_oneAPI:
239239
extends: .compile
@@ -242,7 +242,7 @@ mesh_oneAPI:
242242
# https://community.intel.com/t5/Intel-oneAPI-Math-Kernel-Library/Floating-point-exception-in-dgeev/td-p/1665868
243243
- sed -i '/set (DEBUG_FLAGS "${DEBUG_FLAGS} -fpe-all=0/d' ../../cmake/Compiler-IntelLLVM.cmake
244244
- sed -i 's/FP_TRAP_ON/FP_TRAP_OFF/g' ../../src/parallelization.f90
245-
- python -m pytest -k 'compile and mesh'
245+
- python -m pytest -v -k 'compile and mesh'
246246

247247
Marc_Intel:
248248
stage: compile
@@ -269,19 +269,20 @@ setup_Marc:
269269

270270

271271
###################################################################################################
272-
open-source_grid_GCC:
272+
open-source_GCC:
273273
stage: fortran
274274
tags:
275275
- matesting2-container-runner
276276
image: git.damask-multiphysics.org:5050/damask/damask/gcc_petsc-default:2025.03.10
277277
before_script:
278-
- cmake -DDAMASK_SOLVER=GRID && make -j2 all install
278+
- cmake -DDAMASK_SOLVER=grid -B build/grid && cmake --build build/grid --parallel --target install
279+
- cmake -DDAMASK_SOLVER=mesh -B build/grid && cmake --build build/grid --parallel --target install
279280
- source env/DAMASK.sh
280281
script:
281282
- cd PRIVATE/testing
282-
- pytest -k 'grid and not compile and not (signal or restart)'
283+
- pytest -v -k 'not compile and not (signal or restart) and not Marc'
283284

284-
open-source_grid_signal_restart:
285+
open-source_signal_restart_GCC:
285286
stage: fortran
286287
tags:
287288
- bare-metal
@@ -297,22 +298,10 @@ open-source_grid_signal_restart:
297298
- echo Job start:" $(date)"
298299
script:
299300
- cd PRIVATE/testing
300-
- pytest -k 'grid and not compile and (signal or restart)' -m 'not cifail' --basetemp ${TESTROOT}/open-source -v
301+
- pytest -v -k 'signal or restart' -m 'not cifail' --basetemp ${TESTROOT}/open-source -v
301302
after_script:
302303
- echo Job end:" $(date)"
303304

304-
open-source_mesh_GCC:
305-
tags:
306-
- matesting2-container-runner
307-
image: git.damask-multiphysics.org:5050/damask/damask/gcc_petsc-default:2025.03.10
308-
stage: fortran
309-
before_script:
310-
- make mesh
311-
- source env/DAMASK.sh
312-
script:
313-
- cd PRIVATE/testing
314-
- pytest -k 'mesh and not compile'
315-
316305
Marc:
317306
stage: fortran
318307
tags:

PRIVATE

0 commit comments

Comments
 (0)