.gitlab-ci.yml

@@ -2,7 +2,7 @@ image: alpine
 
 variables:
   ## External images
-  DOCKER_IMAGE: docker.io/docker:24.0.7
+  DOCKER_IMAGE: docker.io/docker:25.0.3
   SINGULARITY_IMAGE: quay.io/singularity/singularity:v3.11.5
 
   ## Default versions are specified in packages.yaml but can be overridden
@@ -101,6 +101,9 @@ version:
         NIGHTLY_TAG="${VERSION}-nightly"
         EXPORT_TAG="${VERSION}"
         DH_PUSH=""
+      elif [ "x${CI_PIPELINE_SOURCE}" = "xtrigger" ]; then
+        VERSION="${CI_COMMIT_BRANCH}"
+        DH_PUSH=""
       elif [[ "$CI_COMMIT_TAG" =~ ^v[0-9.]+\.[0-9]+\.[0-9]+ ]]; then
         VERSION="${CI_COMMIT_TAG:1}"
         EXPORT_TAG="${VERSION}"
@@ -680,6 +683,7 @@ clean_pipeline:
 
 status:success:
   stage: status-report
+  dependencies: []
   extends: .status
   variables:
     STATE: "success"
@@ -688,6 +692,7 @@ status:success:
 
 status:failure:
   stage: status-report
+  dependencies: []
   extends: .status
   variables:
     STATE: "failure"

containers/jug/dev.Dockerfile

@@ -202,6 +202,14 @@ rm -r /usr/local
 spack -e ${SPACK_ENV} env view enable /usr/local
 EOF
 
+## Place cvmfs catalogs
+RUN <<EOF
+touch ${SPACK_ROOT}/.cvmfscatalog
+touch /opt/software/.cvmfscatalog
+find /opt/software -mindepth 2 -maxdepth 3 -type d -exec touch {}/.cvmfscatalog \;
+touch /usr/local/.cvmfscatalog
+EOF
+
 ## Store environment
 RUN <<EOF
 set -e
@@ -293,13 +301,14 @@ COPY --from=staging /usr/bin/docker-shell /usr/bin/docker-shell
 ENV SPACK_ROOT=/opt/spack
 SHELL ["docker-shell"]
 
-## ensure /usr/local link is pointing to the right view
+## ensure /usr/local is the view, not a symlink
 RUN <<EOF
 set -ex
 rm -rf /usr/local
 PREFIX_PATH=$(realpath $(ls /usr/._local/ | tail -n1))
 echo "Found spack true prefix path to be $PREFIX_PATH"
-ln -s /usr/._local/${PREFIX_PATH} /usr/local
+mv /usr/._local/${PREFIX_PATH} /usr/local
+ln -s /usr/local /usr/._local/${PREFIX_PATH}
 EOF
 
 ## set the local spack configuration

containers/jug/setup_detectors.py

@@ -161,12 +161,12 @@ if __name__ == '__main__':
                         file=f)
                 ## run once inside global prefix to initialize artifacts in /opt/detectors
                 os.environ['DETECTOR_PATH'] = args.prefix
-                cmd = f'cd {args.prefix} && source {prefix}/setup.sh && checkGeometry -c {prefix}/share/{det}/{det}.xml'
+                cmd = f'cd {args.prefix} && source {prefix}/setup.sh && ddsim --compactFile {prefix}/share/{det}/{det}.xml --printLevel DEBUG -G -N1'
                 print(cmd)
                 process_list.append(subprocess.Popen(cmd, shell=True, executable='/bin/bash', stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
                 ## run once inside specific prefix to initialize artifacts in $DETECTOR_PATH
                 os.environ['DETECTOR_PATH'] = args.prefix
-                cmd = f'cd {prefix}/share/{det} && source {prefix}/setup.sh && checkGeometry -c {prefix}/share/{det}/{det}.xml'
+                cmd = f'cd {prefix}/share/{det} && source {prefix}/setup.sh && ddsim --compactFile {prefix}/share/{det}/{det}.xml --printLevel DEBUG -G -N1'
                 print(cmd)
                 process_list.append(subprocess.Popen(cmd, shell=True, executable='/bin/bash', stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
 

detectors.yaml

@@ -6,10 +6,6 @@ detectors:
       version: main
     main:
       version: main
-    23.08.0:
-      version: 23.08.0
-      patches:
-      - https://github.com/eic/epic/pull/520.patch
     23.09.0:
       version: 23.09.0
       patches:
@@ -25,4 +21,10 @@ detectors:
     23.12.0:
       version: 23.12.0
     24.02.0:
-      version: 24.02.0
\ No newline at end of file
+      version: 24.02.0
+    24.02.1:
+      version: 24.02.1
+    24.03.0:
+      version: 24.03.0
+    24.03.1:
+      version: 24.03.1

eic-spack.sh

@@ -3,7 +3,7 @@ EICSPACK_ORGREPO="eic/eic-spack"
 
 ## EIC spack commit hash or github version, e.g. v0.19.7
 ## note: nightly builds could use a branch e.g. releases/v0.19
-EICSPACK_VERSION="acde63153d3e650275d85334523e118e45edb414"
+EICSPACK_VERSION="5a7e0e41ab9a8a6cbeda6b2f2c68129ce178f578"
 
 ## Space-separated list of eic-spack cherry-picks
 read -r -d '' EICSPACK_CHERRYPICKS <<- \

spack-environment/packages.yaml

@@ -32,7 +32,7 @@ packages:
     - +root +zlib
   algorithms:
     require:
-    - '@git.6a0e78e3463004bacd78fcb234019f6db5257a9a'
+    - '@git.9acce06e2b8b8d12ef527725e52eff35abd059f8'
   blas:
     require:
     - openblas
@@ -72,7 +72,7 @@ packages:
     - '@1_54a'
   dd4hep:
     require:
-    - '@1.27'
+    - '@1.28'
     - +ddg4 +ddcad +hepmc3 +xercesc
     - any_of: [+ddeve, -ddeve]
   dpmjet:
@@ -94,7 +94,7 @@ packages:
     - '@1.1.12'
   eicrecon:
     require:
-    - '@1.10.0'
+    - '@1.11.0'
   eigen:
     require:
     - '@3.4.0'
@@ -128,7 +128,7 @@ packages:
       prefix: /opt/software/externals/g4ndl
   geant4:
     require:
-    - '@11.1.3.east'
+    - '@11.2.1.east'
     - cxxstd=20 -vecgeom +threads -vtk
     - any_of: [+opengl +qt +x11, -opengl -qt -x11]
   gloo:
@@ -159,7 +159,7 @@ packages:
     - '@0.20'
   jana2:
     require:
-    - '@2.1.2'
+    - '@git.d8fe7adb523432d9e9b7e8fd98b97f7c646053a7'
     - -ipo +podio +root +zmq
   juggler:
     require:

spack.sh

@@ -34,11 +34,23 @@ d3c796f2ce1da2dda198707def297aeab702d33c
 d50f8d7b19e07f25a3ce8de28ff9b352fd926d7f
 9e4fab277b8a5b9ec5587c8a8b6514f12c8042a4
 8f4f691e2b2a6263f661fb0a455bcaf73e90036a
+ef4274ed2ee9545eab399a6249346b56b66415a4
+42b739d6d5b69b825e7992cd88b0b076a9bf0a9e
+c264cf12a21c44358739fbe1fa674d2cb497ab5d
+2d71c6bb8e9816464f14f8878d1777e209784ad3
+a0cd63c21067af59d6a976cc3e7b26c723e49373
+c5e0270ef006b2b04d2f3f89bcaa6bf4d492faae
+bcc5ded2051788d8d0800391d09379417c1caeb7
+eb57d96ea94b0543a8d5ba943444e77e414cc82e
+16d1ed35914262eea27cf41a2c99aea497adc17d
+c352db764598cc4d04299913646bb55d7613eb8a
+c31a998abb9f0b82a59bbfbf55b8111847aac8cb
+c5b8d5c92a88707d0c949b2bd507b2dfc1b79506
 ---
 ## Optional hash table with comma-separated file list
 read -r -d '' SPACK_CHERRYPICKS_FILES <<- \
 --- || true
-[19c20563cc86140aaf352d72079bd9de292be0ac]=var/spack/repos/builtin/packages/hepmc3/package.py,var/spack/repos/builtin/packages/pythia8/package.py
+[19c20563cc86140aaf352d72079bd9de292be0ac]=var/spack/repos/builtin/packages/dd4hep/package.py,var/spack/repos/builtin/packages/hepmc3/package.py,var/spack/repos/builtin/packages/pythia8/package.py
 ---
 ## Ref: https://github.com/spack/spack/commit/[hash]
 ## [hash]: [description]
@@ -68,3 +80,15 @@ read -r -d '' SPACK_CHERRYPICKS_FILES <<- \
 ## d50f8d7b19e07f25a3ce8de28ff9b352fd926d7f: root: sha256 change on latest versions
 ## 9e4fab277b8a5b9ec5587c8a8b6514f12c8042a4: [root] New variants, patches
 ## 8f4f691e2b2a6263f661fb0a455bcaf73e90036a: hepmc3: add v3.2.7
+## ef4274ed2ee9545eab399a6249346b56b66415a4: podio: Add latest tag 0.17.4
+## 42b739d6d5b69b825e7992cd88b0b076a9bf0a9e: podio: depends_on py-graphviz type run (for podio-vis)
+## c264cf12a21c44358739fbe1fa674d2cb497ab5d: dd4hep: avoid IndexError in setup_run_environment
+## 2d71c6bb8e9816464f14f8878d1777e209784ad3: dd4hep: add v1.27.1
+## a0cd63c21067af59d6a976cc3e7b26c723e49373: dd4hep: new version 1.27.2
+## c5e0270ef006b2b04d2f3f89bcaa6bf4d492faae: dd4hep: remove self-referential dependencies
+## bcc5ded2051788d8d0800391d09379417c1caeb7: dd4hep: new version 1.28
+## eb57d96ea94b0543a8d5ba943444e77e414cc82e: geant4/geant4-data: add v10.0.4
+## 16d1ed35914262eea27cf41a2c99aea497adc17d: geant4: new version 11.2.0
+## c352db764598cc4d04299913646bb55d7613eb8a: vecgeom: Use correct checksum for version 1.2.5
+## c31a998abb9f0b82a59bbfbf55b8111847aac8cb: VecGeom: new version 1.2.7 and fix URLs
+## c5b8d5c92a88707d0c949b2bd507b2dfc1b79506: geant4: new version v11.2.1