Skip to content
Snippets Groups Projects
Commit 6385dd4d authored by Wouter Deconinck's avatar Wouter Deconinck
Browse files

Merge remote-tracking branch 'origin/master' into makefile

parents e17ae547 c3f5c4de
No related branches found
No related tags found
No related merge requests found
This commit is part of merge request !540. Comments created here will be created in the context of that merge request.
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
+ 22
− 30
View file @ 6385dd4d
...@@ -4,12 +4,12 @@ variables: ...@@ -4,12 +4,12 @@ variables:
## Application versions used for the main release ## Application versions used for the main release
## note: nightly builds will always use the master/main branch ## note: nightly builds will always use the master/main branch
JUGGLER_VERSION: "v9.3.0" JUGGLER_VERSION: "v9.3.0"
EICRECON_VERSION: "v0.6.4" EICRECON_VERSION: "v1.0.0"
## Spack organization and repository, e.g. spack/spack ## Spack organization and repository, e.g. spack/spack
SPACK_ORGREPO: "spack/spack" SPACK_ORGREPO: "spack/spack"
## Spack github version, e.g. v0.18.1 or commit hash ## Spack github version, e.g. v0.18.1 or commit hash
SPACK_VERSION: "v0.19.1" SPACK_VERSION: "v0.19.2"
## Space-separated list of spack cherry-picks ## Space-separated list of spack cherry-picks
SPACK_CHERRYPICKS: > SPACK_CHERRYPICKS: >
b5ef5c2eb5145020f9de1bcb964626ce6ac2d02e b5ef5c2eb5145020f9de1bcb964626ce6ac2d02e
...@@ -21,7 +21,11 @@ variables: ...@@ -21,7 +21,11 @@ variables:
2f057d729da61e8c12828df44377f0a93fed820f 2f057d729da61e8c12828df44377f0a93fed820f
39a1f1462b0abf12dfaccd33f84142c852c4b56e 39a1f1462b0abf12dfaccd33f84142c852c4b56e
4b12d015e1c316b4837e02ae37e2c69a8a647180 4b12d015e1c316b4837e02ae37e2c69a8a647180
f83d47442dade012b1019840181b8dd459fd8edd
7f1467e795b1cab8b4855e019910c509896ea0e1 7f1467e795b1cab8b4855e019910c509896ea0e1
ebc24b7063ba9a8eb43b4424aac5143cf958d76f
a47ebe57841f13239e881ed69eab4949b1d98c32
ab999d5af90f1bff644b5134bb370b2716e1bcf0
62da76cb5dca4d52c43bee06230cca6a5882f05d 62da76cb5dca4d52c43bee06230cca6a5882f05d
cc2ae9f270befa554ba8b09c68e89bb8248ea650 cc2ae9f270befa554ba8b09c68e89bb8248ea650
ae98d2ba2fcefa9d027e2d6ccc6e7558a32e7228 ae98d2ba2fcefa9d027e2d6ccc6e7558a32e7228
...@@ -46,7 +50,11 @@ variables: ...@@ -46,7 +50,11 @@ variables:
## 2f057d729da61e8c12828df44377f0a93fed820f: py-scipy: add v1.9 ## 2f057d729da61e8c12828df44377f0a93fed820f: py-scipy: add v1.9
## 39a1f1462b0abf12dfaccd33f84142c852c4b56e: SIP build system: fix "python not defined in builder" ## 39a1f1462b0abf12dfaccd33f84142c852c4b56e: SIP build system: fix "python not defined in builder"
## 4b12d015e1c316b4837e02ae37e2c69a8a647180: py-jinja2-cli: new package ## 4b12d015e1c316b4837e02ae37e2c69a8a647180: py-jinja2-cli: new package
## f83d47442dade012b1019840181b8dd459fd8edd: dd4hep: depends_on root +x +opengl when +utilityapps
## 7f1467e795b1cab8b4855e019910c509896ea0e1: dd4hep: new version 1.24, depends_on podio@0.16: ## 7f1467e795b1cab8b4855e019910c509896ea0e1: dd4hep: new version 1.24, depends_on podio@0.16:
## ebc24b7063ba9a8eb43b4424aac5143cf958d76f: dd4hep: extend conflict on CMake
## a47ebe57841f13239e881ed69eab4949b1d98c32: dd4hep: new versions 1.25, 1.25.1
## ab999d5af90f1bff644b5134bb370b2716e1bcf0: dd4hep: depends_on root +webgui when +ddeve ^root @6.28:
## 62da76cb5dca4d52c43bee06230cca6a5882f05d: directives: depends_on should not admit anonymous specs ## 62da76cb5dca4d52c43bee06230cca6a5882f05d: directives: depends_on should not admit anonymous specs
## cc2ae9f270befa554ba8b09c68e89bb8248ea650: Add a "maintainer" directive ## cc2ae9f270befa554ba8b09c68e89bb8248ea650: Add a "maintainer" directive
## ae98d2ba2fcefa9d027e2d6ccc6e7558a32e7228: Support packages for using scitokens on OSG ## ae98d2ba2fcefa9d027e2d6ccc6e7558a32e7228: Support packages for using scitokens on OSG
...@@ -197,12 +205,17 @@ version: ...@@ -197,12 +205,17 @@ version:
.build: .build:
rules: rules:
- when: on_success - when: on_success
resource_group: ${CI_COMMIT_REF_NAME} resource_group: ${CI_COMMIT_REF_NAME}-${VERSION}
tags: tags:
- docker-new - docker-new
before_script: before_script:
- !reference [default, before_script] - !reference [default, before_script]
- docker run --rm --privileged multiarch/qemu-user-static --reset -p yes - mount binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc ;
for arch in aarch64 ; do
if ! grep --quiet enabled /proc/sys/fs/binfmt_misc/qemu-$arch ; then
docker run --rm --privileged multiarch/qemu-user-static --persistent yes ;
fi ;
done
- docker buildx create --name builder --driver docker-container --bootstrap --use - docker buildx create --name builder --driver docker-container --bootstrap --use
## Images: ## Images:
...@@ -376,10 +389,10 @@ jug_xl:nightly: ...@@ -376,10 +389,10 @@ jug_xl:nightly:
${CI_PUSH:+-t ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}:${NIGHTLY_TAG}} ${CI_PUSH:+-t ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}:${NIGHTLY_TAG}}
${DH_PUSH:+-t ${DH_REGISTRY}/${DH_REGISTRY_USER}/${BUILD_IMAGE}:${NIGHTLY_TAG}} ${DH_PUSH:+-t ${DH_REGISTRY}/${DH_REGISTRY_USER}/${BUILD_IMAGE}:${NIGHTLY_TAG}}
${GH_PUSH:+-t ${GH_REGISTRY}/${GH_REGISTRY_USER}/${BUILD_IMAGE}:${NIGHTLY_TAG}} ${GH_PUSH:+-t ${GH_REGISTRY}/${GH_REGISTRY_USER}/${BUILD_IMAGE}:${NIGHTLY_TAG}}
} ${PUSH_NIGHTLY_WITH_DATE:+
${PUSH_NIGHTLY_WITH_DATE:+ ${DH_PUSH:+-t ${DH_REGISTRY}/${DH_REGISTRY_USER}/${NIGHTLY_TAG}-$(date +%Y-%m-%d)}
${DH_PUSH:+-t ${DH_REGISTRY}/${DH_REGISTRY_USER}/${NIGHTLY_TAG}-$(date +%Y-%m-%d)} ${GH_PUSH:+-t ${GH_REGISTRY}/${GH_REGISTRY_USER}/${NIGHTLY_TAG}-$(date +%Y-%m-%d)}
${GH_PUSH:+-t ${GH_REGISTRY}/${GH_REGISTRY_USER}/${NIGHTLY_TAG}-$(date +%Y-%m-%d)} }
} }
-f containers/jug/xl.Dockerfile -f containers/jug/xl.Dockerfile
--platform ${PLATFORM} --platform ${PLATFORM}
...@@ -427,7 +440,6 @@ jug_xl:feature: ...@@ -427,7 +440,6 @@ jug_xl:feature:
.singularity: .singularity:
stage: deploy stage: deploy
interruptible: true interruptible: true
resource_group: ${CI_COMMIT_REF_NAME}
rules: rules:
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
when: never when: never
...@@ -471,25 +483,6 @@ jug_xl:singularity:nightly: ...@@ -471,25 +483,6 @@ jug_xl:singularity:nightly:
- mkdir build - mkdir build
- singularity pull build/${BUILD_IMAGE}.sif docker://${CI_REGISTRY_IMAGE}/${BUILD_IMAGE}:${NIGHTLY_TAG} - singularity pull build/${BUILD_IMAGE}.sif docker://${CI_REGISTRY_IMAGE}/${BUILD_IMAGE}:${NIGHTLY_TAG}
## trigger juggler rebuild on nightly schedule to ensure both images remain in sync
juggler:main:
stage: deploy
rules:
- if: '$NIGHTLY != "0" && $CI_COMMIT_BRANCH == "master"'
when: on_success
- when: never
needs:
- version
- jug_xl:nightly
variables:
TRIGGERED_BY_NIGHTLY: 1
JUGGLER_VERSION: main
DETECTOR_VERSION: master
IP6_VERSION: master
trigger:
project: EIC/juggler
allow_failure: true
benchmarks:reconstruction: benchmarks:reconstruction:
stage: benchmarks stage: benchmarks
rules: rules:
...@@ -504,7 +497,6 @@ benchmarks:reconstruction: ...@@ -504,7 +497,6 @@ benchmarks:reconstruction:
trigger: trigger:
project: EIC/benchmarks/reconstruction_benchmarks project: EIC/benchmarks/reconstruction_benchmarks
strategy: depend strategy: depend
## for now allow failure, as we need to update those pipelines
allow_failure: false allow_failure: false
benchmarks:physics: benchmarks:physics:
...@@ -515,7 +507,7 @@ benchmarks:physics: ...@@ -515,7 +507,7 @@ benchmarks:physics:
- version - version
- jug_xl:default - jug_xl:default
variables: variables:
RECO: "juggler" RECO: "eicrecon"
BENCHMARKS_TAG: "$INTERNAL_TAG" BENCHMARKS_TAG: "$INTERNAL_TAG"
BENCHMARKS_CONTAINER: "jug_xl" BENCHMARKS_CONTAINER: "jug_xl"
BENCHMARKS_REGISTRY: "$CI_REGISTRY_IMAGE" BENCHMARKS_REGISTRY: "$CI_REGISTRY_IMAGE"
......
containers/jug/dev.Dockerfile
+ 2
− 2
View file @ 6385dd4d
...@@ -59,7 +59,7 @@ RUN declare -A arch=( \ ...@@ -59,7 +59,7 @@ RUN declare -A arch=( \
## Setup spack buildcache mirrors, including an internal ## Setup spack buildcache mirrors, including an internal
## spack mirror using the docker build cache, and ## spack mirror using the docker build cache, and
## a backup mirror on the internal B010 network ## a backup mirror on the internal B010 network
RUN --mount=type=cache,target=/var/cache/spack-mirror,sharing=locked \ RUN --mount=type=cache,target=/var/cache/spack-mirror \
export PATH=$PATH:$SPACK_ROOT/bin \ export PATH=$PATH:$SPACK_ROOT/bin \
&& spack mirror add docker /var/cache/spack-mirror \ && spack mirror add docker /var/cache/spack-mirror \
&& spack buildcache update-index -d /var/cache/spack-mirror \ && spack buildcache update-index -d /var/cache/spack-mirror \
...@@ -68,7 +68,7 @@ RUN --mount=type=cache,target=/var/cache/spack-mirror,sharing=locked \ ...@@ -68,7 +68,7 @@ RUN --mount=type=cache,target=/var/cache/spack-mirror,sharing=locked \
## Setup eic-spack buildcache mirrors (FIXME: leaks credentials into layer) ## Setup eic-spack buildcache mirrors (FIXME: leaks credentials into layer)
ARG S3_ACCESS_KEY="" ARG S3_ACCESS_KEY=""
ARG S3_SECRET_KEY="" ARG S3_SECRET_KEY=""
RUN --mount=type=cache,target=/var/cache/spack-mirror,sharing=locked \ RUN --mount=type=cache,target=/var/cache/spack-mirror \
export PATH=$PATH:$SPACK_ROOT/bin \ export PATH=$PATH:$SPACK_ROOT/bin \
&& if [ -n "${S3_ACCESS_KEY}" ] ; then \ && if [ -n "${S3_ACCESS_KEY}" ] ; then \
spack mirror add --scope site \ spack mirror add --scope site \
......
spack-environment/dev/spack.yaml
+ 1
− 1
View file @ 6385dd4d
...@@ -15,7 +15,7 @@ spack: ...@@ -15,7 +15,7 @@ spack:
- cppcoro@git.10bbcdbf2be3ad3aa56febcf4c7662d771460a99 - cppcoro@git.10bbcdbf2be3ad3aa56febcf4c7662d771460a99
- dawn@3_91a - dawn@3_91a
- dawncut@1_54a - dawncut@1_54a
- dd4hep@1.24 +ddg4 +ddcad -frames +hepmc3 +lcio - dd4hep@1.25.1 +ddg4 +ddcad +hepmc3 +lcio
- edm4eic@1.2.2 cxxstd=17 - edm4eic@1.2.2 cxxstd=17
- edm4hep@0.7 cxxstd=17 - edm4hep@0.7 cxxstd=17
- eic-smear@1.1.10 - eic-smear@1.1.10
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment