containers/debian/base.Dockerfile

@@ -154,6 +154,7 @@ RUN <<EOF
 git config --global user.email "gitlab@eicweb.phy.anl.gov"
 git config --global user.name "EIC Container Build Service"
 git config --global advice.detachedHead false
+git config --global gc.autoDetach false
 git clone --filter=tree:0 https://github.com/${SPACK_ORGREPO}.git ${SPACK_ROOT}
 git -C ${SPACK_ROOT} checkout ${SPACK_VERSION}
 if [ -n "${SPACK_CHERRYPICKS}" ] ; then

eic-spack.sh

@@ -3,4 +3,4 @@ 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="bd66c9c7ff9f720567f12f13b49233198efa5132"
+EICSPACK_VERSION="c8dae5e15d61a3a7b8c87a1a4c7c8ca2893755db"

spack-environment/packages.yaml

@@ -77,7 +77,7 @@ packages:
     - '@1_54a'
   dd4hep:
     require:
-    - '@1.29'
+    - '@1.30'
     - +ddg4 +ddcad +hepmc3 +utilityapps +xercesc
     - any_of: [+ddeve, -ddeve]
   dpmjet:
@@ -153,6 +153,9 @@ packages:
   gettext: 
     require:
     - +libxml2
+  gfal2:
+    require:
+    - +file +xrootd
   gl:
     require:
     - glx
@@ -184,7 +187,7 @@ packages:
     - '@0.20'
   jana2:
     require:
-    - '@2.3.1'
+    - '@2.3.2'
     - -ipo +podio +root +zmq
   juggler:
     require:
@@ -410,6 +413,9 @@ packages:
   stow:
     require:
     - '@2.3.1'
+  strace:
+    require:
+    - -mpers
   tensorflow-lite:
     require:
     - '@2.8.0'

spack-environment/xl/spack.yaml

@@ -38,6 +38,7 @@ spack:
   - gaudi
   - gdb
   - geant4 +opengl
+  - gfal2
   - graphviz
   - hepmc3
   - heppdt
@@ -89,6 +90,7 @@ spack:
   - py-pre-commit
   - py-pycairo
   - py-pyyaml
+  - py-rucio-clients
   - py-scipy
   - py-seaborn
   - py-toml
@@ -102,6 +104,7 @@ spack:
   - snakemake
   - spdlog
   - stow
+  - strace
   - valgrind
   - xrootd
   - xeyes

spack.sh

@@ -34,12 +34,22 @@ f8f01c336c882f29ac364995423b9f69ac365462
 7b9f8abce5cee74546a6f588f88c6f353170d52b
 096ab11961995ac8d69f7b177cbcadf618d3068e
 6c4abef75cb2b98c337f8a3179797e29dfdc9ca3
+9cdb2a8dbb742169fefe0214ee76530e7f14dfdf
+04f0af0a28e1f6ff0ef0b50e28ecf9d19fe544e6
+395491815acb20e48050b77dca457aa7cc340ca1
+43d1cdb0bd4780bff369dafa681a8a7939313784
+5bc105c01c0e458924df40d51f7111ba507689f9
+dce2f4ca7cb0c96d1be94ef6ee7a3f0c45207af0
+fbceae7773c51198a775efffd7a9e21d0fe1e05c
+e91a69a7564dfe54718541954607d89c086caf12
+26bc91fe9bde4549fb39062e1dd838b612205717
+ddf1a1a74ba2ee99377edc2100e0478c1ddd3653
 ---
 ## Optional hash table with comma-separated file list
 read -r -d '' SPACK_CHERRYPICKS_FILES <<- \
 --- || true
 [67536058077995cab1ed23b8ca62aaf75463ae04]=var/spack/repos/builtin/packages/py-protobuf/package.py
-[7b9f8abce5cee74546a6f588f88c6f353170d52b]=var/spack/repos/builtin/packages/protobuf/package.py,var/spack/repos/builtin/packages/py-protobuf/package.py
+[7b9f8abce5cee74546a6f588f88c6f353170d52b]=var/spack/repos/builtin/packages/protobuf/package.py,var/spack/repos/builtin/packages/py-protobuf/package.py,var/spack/repos/builtin/packages/strace/package.py
 ---
 ## Ref: https://github.com/spack/spack/commit/[hash]
 ## [hash]: [description]
@@ -69,3 +79,13 @@ read -r -d '' SPACK_CHERRYPICKS_FILES <<- \
 ## 7b9f8abce5cee74546a6f588f88c6f353170d52b: Add depends_on([c,cxx,fortran])
 ## 096ab11961995ac8d69f7b177cbcadf618d3068e: py-onnx: link to external protobuf
 ## 6c4abef75cb2b98c337f8a3179797e29dfdc9ca3: py-protobuf: drop +cpp, always require protobuf
+## 9cdb2a8dbb742169fefe0214ee76530e7f14dfdf: dd4hep: depends_on root +root7 in some cases
+## 04f0af0a28e1f6ff0ef0b50e28ecf9d19fe544e6: acts,dd4hep: restrict to podio@0 to prevent failures with podio@1
+## 395491815acb20e48050b77dca457aa7cc340ca1: dd4hep: mark conflict with root@6.31.1:
+## 43d1cdb0bd4780bff369dafa681a8a7939313784: dd4hep: Add tag for version 1.30
+## 5bc105c01c0e458924df40d51f7111ba507689f9: gfal2: new package (and dependencies)
+## dce2f4ca7cb0c96d1be94ef6ee7a3f0c45207af0: strace: add v6.11 and mpers variant (disabed by default)
+## fbceae7773c51198a775efffd7a9e21d0fe1e05c: [py-datasets] Add py-datasets version 2.20.0
+## e91a69a7564dfe54718541954607d89c086caf12: py-tabulate: add v0.8.10, v0.9.0
+## 26bc91fe9bde4549fb39062e1dd838b612205717: py-rucio-clients: new package (and dependencies)
+## ddf1a1a74ba2ee99377edc2100e0478c1ddd3653: py-urllib3: add v1.26.20
\ No newline at end of file