feat: add custom versions in $ENV/epic with include_concrete of $ENV

Author: wdconinc

containers/eic/Dockerfile

@@ -159,6 +159,9 @@ ARG TARGETPLATFORM
 # Open Container Initiative labels
 LABEL org.opencontainers.image.title="Electron-Ion Collider build concretization image (custom configuration, $TARGETPLATFORM)"
 
+# Set spack environment directory
+ENV SPACK_ENV=/opt/spack-environment/${ENV}/epic
+
 ## 2. Setup our environment with custom versions (on top of cached layer)
 ## Note: these default versions are just the very first commit.
 ARG EDM4EIC_VERSION="8aeb507f93a93257c99985efbce0ec1371e0b331"
@@ -179,8 +182,8 @@ if [ "${EICRECON_VERSION}" != "28108da4a1e8919a05dfdb5f11e114800a2cbe96" ] ; the
   spack deconcretize -y --all eicrecon
 fi
 if [ "${EPIC_VERSION}" != "c1827f05430b2051df8a0b421db1cbab87165e0b" ] ; then
-  sed -i "/# EPIC_VERSION$/ s/epic\s/epic@git.${EPIC_VERSION}=main /" /opt/spack-environment/${ENV}/spack.yaml
-  sed -i "/# EPIC_VERSION$/ s/epic@main\s/epic@git.${EPIC_VERSION}=main /" /opt/spack-environment/${ENV}/spack.yaml
+  sed -i "/# EPIC_VERSION$/ s/epic\s/epic@git.${EPIC_VERSION}=main /" /opt/spack-environment/${ENV}/epic/spack.yaml
+  sed -i "/# EPIC_VERSION$/ s/epic@main\s/epic@git.${EPIC_VERSION}=main /" /opt/spack-environment/${ENV}/epic/spack.yaml
   spack deconcretize -y --all epic
 fi
 if [ "${JUGGLER_VERSION}" != "df87bf1f8643afa8e80bece9d36d6dc26dfe8132" ] ; then
@@ -228,7 +231,6 @@ RUN --mount=type=cache,target=/ccache,id=ccache-${TARGETPLATFORM}              \
 set -e
 export CCACHE_DIR=/ccache
 spack ${SPACK_FLAGS} install ${SPACK_INSTALL_FLAGS}
-
 spack gc --yes-to-all go go-bootstrap rust rust-bootstrap py-setuptools-rust py-maturin
 ccache --show-stats
 ccache --zero-stats
@@ -245,9 +247,15 @@ ARG TARGETPLATFORM
 # Open Container Initiative labels
 LABEL org.opencontainers.image.title="Electron-Ion Collider runtime concretization image (custom configuration, $TARGETPLATFORM)"
 
+# Set spack environment directory
+ENV SPACK_ENV=/opt/spack-environment/${ENV}/epic
+
 COPY --from=builder_installation_custom \
   /opt/spack-environment/${ENV}/spack.* \
   /opt/spack-environment/${ENV}/
+COPY --from=builder_installation_custom \
+  /opt/spack-environment/${ENV}/epic/spack.* \
+  /opt/spack-environment/${ENV}/epic/
 COPY --from=builder_installation_custom \
   /opt/spack-environment/packages.yaml \
   /opt/spack-environment/
@@ -268,8 +276,9 @@ RUN --mount=type=cache,target=/var/cache/spack                          \
     --mount=type=secret,id=mirrors,target=/opt/spack/etc/spack/mirrors.yaml \
     <<EOF
 set -e
+spack env activate --dir ${SPACK_ENV}
 spack ${SPACK_FLAGS} install ${SPACK_INSTALL_FLAGS} --use-buildcache only
-spack gc --yes-to-all
+spack gc --yes-to-all go go-bootstrap rust rust-bootstrap py-setuptools-rust py-maturin
 EOF
 
 

spack-environment/ci/epic/spack.yaml

@@ -0,0 +1,13 @@
+spack:
+  include:
+  - ../../concretizer.yaml
+  - ../../packages.yaml
+  - ../../view.yaml
+  include_concrete:
+  - /opt/spack-environment/ci
+  specs:
+  - algorithms
+  - edm4eic
+  - eicrecon
+  - epic@main # EPIC_VERSION
+  - juggler

spack-environment/ci/spack.yaml

@@ -7,15 +7,11 @@ spack:
   - acts
   - actsvg
   - afterburner
-  - algorithms
   - cmake
   - covfie
   - dd4hep -ddeve
-  - edm4eic
   - edm4hep
-  - eicrecon
   - eigen
-  - epic@main # EPIC_VERSION
   - fastjet
   - fjcontrib
   - fmt
@@ -31,7 +27,6 @@ spack:
   - irt
   - iwyu
   - jana2
-  - juggler
   - nopayloadclient
   - npsim -geocad
   - onnx
@@ -73,4 +68,4 @@ spack:
   - root -opengl -webgui
   - snakemake
   - spdlog
-  - xrootd
+  - xrootd

spack-environment/ci_without_acts/epic/spack.yaml

@@ -0,0 +1,11 @@
+spack:
+  include:
+  - ../../concretizer.yaml
+  - ../../packages.yaml
+  - ../../view.yaml
+  include_concrete:
+  - /opt/spack-environment/ci_without_acts
+  specs:
+  - algorithms
+  - edm4eic
+  - epic@main # EPIC_VERSION

spack-environment/ci_without_acts/spack.yaml

@@ -6,14 +6,11 @@ spack:
   specs:
   - actsvg
   - afterburner
-  - algorithms
   - cmake
   - covfie
   - dd4hep -ddeve
-  - edm4eic
   - edm4hep
   - eigen
-  - epic@main # EPIC_VERSION
   - fastjet
   - fjcontrib
   - fmt
@@ -70,4 +67,4 @@ spack:
   - root -opengl -webgui
   - snakemake
   - spdlog
-  - xrootd
+  - xrootd

spack-environment/cuda/epic/spack.yaml

@@ -0,0 +1,23 @@
+spack:
+  include:
+  - ../../concretizer.yaml
+  - ../../packages.yaml
+  - ../../view.yaml
+  include_concrete:
+  - /opt/spack-environment/cuda
+  concretizer:
+    unify: when_possible # multiple epic versions
+  specs:
+  - algorithms
+  - edm4eic
+  - eicrecon
+  - epic@main # EPIC_VERSION
+  - epic@25.07.0
+  - epic@25.08.0
+  - epic@25.09.0
+  - epic@25.10.0
+  - epic@25.10.1
+  - epic@25.10.2
+  - epic@25.10.3
+  - epic@25.11.0
+  - juggler

spack-environment/cuda/spack.yaml

@@ -9,7 +9,6 @@ spack:
   - acts +cuda cuda_arch=75
   - actsvg
   - afterburner
-  - algorithms
   - cairo
   - catch2
   - celeritas +cuda cuda_arch=75
@@ -24,20 +23,10 @@ spack:
   - dd4hep +ddeve
   - dpmjet
   - east
-  - edm4eic
   - edm4hep
   - eic-smear
-  - eicrecon
   - eigen
   - emacs
-  - epic@main # EPIC_VERSION
-  - epic@25.08.0
-  - epic@25.09.0
-  - epic@25.10.0
-  - epic@25.10.1
-  - epic@25.10.2
-  - epic@25.10.3
-  - epic@25.11.0
   - fastjet
   - fjcontrib
   - fmt
@@ -50,7 +39,6 @@ spack:
   - imagemagick
   - irt
   - jana2
-  - juggler
   - k4actstracking
   - k4fwcore
   - lcov
@@ -106,4 +94,4 @@ spack:
   - stow
   - valgrind
   - xrootd
-  - xeyes
+  - xeyes

spack-environment/dbg/epic/spack.yaml

@@ -0,0 +1,12 @@
+spack:
+  include:
+  - ../../concretizer.yaml
+  - ../../packages.yaml
+  - ../../view.yaml
+  include_concrete:
+  - /opt/spack-environment/dbg
+  specs:
+  - algorithms build_type=Debug
+  - edm4eic build_type=Debug
+  - eicrecon build_type=Debug
+  - epic build_type=Debug # EPIC_VERSION

spack-environment/dbg/spack.yaml

@@ -5,13 +5,9 @@ spack:
   - ../view.yaml
   specs:
   - acts build_type=Debug
-  - algorithms build_type=Debug
   - cmake
   - dd4hep build_type=Debug
-  - edm4eic build_type=Debug
   - edm4hep build_type=Debug
-  - eicrecon build_type=Debug
-  - epic build_type=Debug # EPIC_VERSION
   - gdb
   - irt build_type=Debug
   - jana2 build_type=Debug

spack-environment/prod/epic/spack.yaml

@@ -0,0 +1,13 @@
+spack:
+  include:
+  - ../../concretizer.yaml
+  - ../../packages.yaml
+  - ../../view.yaml
+  include_concrete:
+  - /opt/spack-environment/prod
+  specs:
+  - algorithms
+  - edm4eic
+  - eicrecon
+  - epic # EPIC_VERSION
+  - juggler