Skip to content

Commit 197ef1c

Browse files
committed
Merge branch 'updated_gitlab_runners' into 'development'
Followup for updated gitlab runners See merge request damask/DAMASK!1060
2 parents d06755c + 3804969 commit 197ef1c

File tree

1 file changed

+4
-12
lines changed

1 file changed

+4
-12
lines changed

.gitlab-ci.yml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,6 @@ create_testroot_matesting:
3838
script:
3939
- mkdir -p ${TESTROOT}
4040

41-
create_testroot_matesting2:
42-
stage: prepare
43-
tags:
44-
- matesting2_bare-metal
45-
script:
46-
- mkdir -p ${TESTROOT}
47-
4841
.on_merge:
4942
rules:
5043
- if: $CI_PIPELINE_SOURCE == 'merge_request_event'
@@ -306,7 +299,7 @@ open-source_GCC:
306299
image: git.damask-multiphysics.org:5050/damask/damask/gcc_petsc-default:2025.03.10
307300
before_script:
308301
- cmake -DDAMASK_SOLVER=grid -B build/grid && cmake --build build/grid --parallel 2 --target install
309-
- cmake -DDAMASK_SOLVER=mesh -B build/grid && cmake --build build/grid --parallel 2 --target install
302+
- cmake -DDAMASK_SOLVER=mesh -B build/mesh && cmake --build build/mesh --parallel 2 --target install
310303
- source env/DAMASK.sh
311304
- export OPENBLAS_NUM_THREADS=1
312305
script:
@@ -316,7 +309,7 @@ open-source_GCC:
316309
open-source_signal_restart_GCC:
317310
stage: fortran
318311
tags:
319-
- matesting2_bare-metal
312+
- matesting_bare-metal
320313
before_script:
321314
- source /etc/zsh/spackenv
322315
- spack env activate DAMASK_oneapi_2503
@@ -361,7 +354,7 @@ grid_performance:
361354
- make -j2 all install
362355
- export PATH=${PWD}/bin:${PATH}
363356
- cd $(mktemp -d)
364-
- git clone -q git@git.damask-multiphysics.org:damask/statistics.git .
357+
- git clone -q https://damask_user:${STATISTICS_TOKEN}@git.damask-multiphysics.org/damask/statistics.git .
365358
- ./measure_performance.py --input_dir ${CI_PROJECT_DIR}/examples/grid --tag ${CI_COMMIT_SHA}
366359
- >
367360
if [ ${CI_COMMIT_BRANCH} == development ]; then
@@ -396,8 +389,7 @@ update_revision:
396389
- echo Job start:" $(date)"
397390
script:
398391
- cd $(mktemp -d)
399-
- git clone -q git@git.damask-multiphysics.org:damask/DAMASK.git .
400-
- git pull
392+
- git clone -b development -q https://damask_user:${TOKEN}@git.damask-multiphysics.org/damask/DAMASK.git .
401393
- export VERSION=$(git describe ${CI_COMMIT_SHA})
402394
- echo ${VERSION:1} > VERSION
403395
- >

0 commit comments

Comments
 (0)