Skip to content

Commit e4ab6d6

Browse files
committed
Merge branch '512-use-containers-for-update-jobs' into 'development'
containerize remaining baremetal tests Closes #512 See merge request damask/DAMASK!1090
2 parents 197e8a3 + 06f27c6 commit e4ab6d6

File tree

2 files changed

+27
-23
lines changed

2 files changed

+27
-23
lines changed

.gitlab-ci.yml

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ variables:
1616
# ===============================================================================================
1717
MARC_VERSION: '2024.1'
1818
PETSC_GCC_LATEST: '2025.05.27'
19-
PETSC_ONEAPI_LATEST: '2025.04.30'
19+
PETSC_ONEAPI_LATEST: '2025.06.12'
2020

2121

2222
###################################################################################################
@@ -297,57 +297,61 @@ Marc_run:
297297
# stage: core
298298
# script: Phenopowerlaw_singleSlip/test.py
299299

300-
###################################################################################################
301300
grid_performance:
302301
stage: core
302+
image: git.damask-multiphysics.org:5050/damask/damask/oneapi_petsc-default:${PETSC_ONEAPI_LATEST}
303303
tags:
304-
- matesting_bare-metal
304+
- matesting
305305
before_script:
306-
- source /etc/zsh/spackenv
307-
- spack env activate DAMASK_oneapi_2503
306+
- cmake -DDAMASK_SOLVER=grid -DOPTIMIZATION=AGGRESSIVE -B build/grid
307+
- cmake --build build/grid --parallel 4 --target install
308308
- source env/DAMASK.sh
309309
script:
310-
- cd $(mktemp -d)
311-
- cmake -DOPTIMIZATION=AGGRESSIVE -DDAMASK_SOLVER=grid -DCMAKE_INSTALL_PREFIX=./ ${CI_PROJECT_DIR}
312-
- make -j2 all install
313-
- export PATH=${PWD}/bin:${PATH}
314-
- cd $(mktemp -d)
315-
- git clone -q https://damask_user:${STATISTICS_TOKEN}@git.damask-multiphysics.org/damask/statistics.git .
316-
- ./measure_performance.py --input_dir ${CI_PROJECT_DIR}/examples/grid --tag ${CI_COMMIT_SHA}
317-
- cp performance.txt ${CI_PROJECT_DIR}/
310+
- git clone -q https://damask_user:${STATISTICS_TOKEN}@git.damask-multiphysics.org/damask/statistics.git
311+
- ./statistics/measure_performance.py --input_dir examples/grid --tag ${CI_COMMIT_SHA}
318312
artifacts:
319-
untracked: true
320313
paths: [performance.txt]
314+
expire_in: 1 month
321315

322316
###################################################################################################
323317

324318
update_statistics:
325319
stage: update_repositories
320+
image:
321+
name: alpine/git
322+
entrypoint: [""]
326323
tags:
327-
- matesting_bare-metal # could be any runner, needs git and should be fast to set up
328-
dependencies:
329-
- grid_performance
324+
- docker_all
325+
needs:
326+
- job: grid_performance
327+
artifacts: true
330328
script:
331-
- cd $(mktemp -d)
332-
- git clone -q https://damask_user:${STATISTICS_TOKEN}@git.damask-multiphysics.org/damask/statistics.git .
333-
- cp ${CI_PROJECT_DIR}/performance.txt .
329+
- git clone -q https://damask_user:${STATISTICS_TOKEN}@git.damask-multiphysics.org/damask/statistics.git
330+
- cp performance.txt statistics/
331+
- cd statistics
334332
- git add performance.txt
335333
- git commit -m ${CI_PIPELINE_ID}_${CI_COMMIT_SHA}
336334
- git push
337335
rules: [if: $CI_COMMIT_BRANCH == 'development']
338336

339337
update_revision:
340338
stage: update_repositories
339+
image:
340+
name: alpine/git
341+
entrypoint: [""]
341342
tags:
342-
- matesting_bare-metal # could be any runner, needs git and should be fast to set up
343+
- docker_all
344+
before_script:
345+
- git config --global user.name "testbot"
346+
- git config --global user.email "[email protected]"
343347
script:
344348
- cd $(mktemp -d)
345349
- git clone -b development -q https://damask_user:${TOKEN}@git.damask-multiphysics.org/damask/DAMASK.git .
346350
- export VERSION=$(git describe ${CI_COMMIT_SHA})
347351
- echo ${VERSION:1} > VERSION
348352
- >
349353
git diff-index --quiet HEAD ||
350-
git commit VERSION -m "[skip ci] updated version information after successful test of ${VERSION}"
354+
git commit VERSION -m "[skip ci] updated version information after successful test of $VERSION"
351355
- if [ ${CI_COMMIT_SHA} == $(git rev-parse HEAD^) ]; then git push --atomic --no-verify origin HEAD:development HEAD:master; fi
352356
rules: [if: $CI_COMMIT_BRANCH == 'development']
353357

PRIVATE

0 commit comments

Comments
 (0)