.gitlab-ci.yml

@@ -483,13 +483,17 @@ clean:
   script:
     ## remove the pipeline specific export from eicweb if needed
     - echo "Cleaning up pipeline specific docker tags if needed"
-    - ./gitlab-ci/cleanup_registry.sh -i debian_testing_base -r 66 ${INTERNAL_TAG}
+    - ./gitlab-ci/cleanup_registry.sh -i debian_base -r 66 ${INTERNAL_TAG}
+    - ./gitlab-ci/cleanup_registry.sh -i ubuntu_base -r 80 ${INTERNAL_TAG}
+    - ./gitlab-ci/cleanup_registry.sh -i debian_testing_base -r 83 ${INTERNAL_TAG}
+    - ./gitlab-ci/cleanup_registry.sh -i debian_stable_base -r 92 ${INTERNAL_TAG}
     - ./gitlab-ci/cleanup_registry.sh -i jug_dev -r 68 ${INTERNAL_TAG}
     - ./gitlab-ci/cleanup_registry.sh -i jug_xl -r 69 ${INTERNAL_TAG}
     - |
       if [ "$CI_PIPELINE_SOURCE" == "merge_request_event" ]; then
         ./gitlab-ci/cleanup_registry.sh -i jug_xl -r 69 ${NIGHTLY_TAG}
       fi
+    - ./gitlab-ci/cleanup_registry.sh -i dind -r 93 ${INTERNAL_TAG}
 
 clean_unstable_mr:
   stage: finalize

eic-spack.sh

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

spack-environment/dev/spack.yaml

@@ -20,7 +20,7 @@ spack:
     - dd4hep@1.25.1 +ddg4 +ddcad -frames +hepmc3 +lcio +xercesc
     - dpmjet@19.3.5
     - edm4eic@2.0.0 cxxstd=17
-    - edm4hep@=0.7 cxxstd=17
+    - edm4hep@0.7.2 cxxstd=17
     - eic-smear@1.1.10
     - eigen@3.4.0
     - emacs@28.2
@@ -30,6 +30,7 @@ spack:
     - gaudi@36.10 +aida
     - gdb@12.1 -debuginfod
     - geant4@11.1.1 cxxstd=17 +opengl -vecgeom +x11 +qt +threads
+    - graphviz@8.0.1
     - hepmc3@3.2.6 +python +rootio
     - heppdt@2.06.01
     - imagemagick@7.0.8-7