eic · wdconinc · Nov 23, 2025 · Nov 21, 2025 · Nov 21, 2025 · Nov 21, 2025
diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml
@@ -82,7 +82,8 @@ jobs:
         run: |
           source spack.sh
           echo "orgrepo=${SPACK_ORGREPO}" | tee -a $GITHUB_OUTPUT
-          echo "version=$(.ci/resolve_git_ref ${SPACK_ORGREPO} ${SPACK_VERSION})" | tee -a $GITHUB_OUTPUT
+          echo "version=${SPACK_VERSION}" | tee -a $GITHUB_OUTPUT
+          echo "sha=$(.ci/resolve_git_ref ${SPACK_ORGREPO} ${SPACK_VERSION})" | tee -a $GITHUB_OUTPUT
           echo "cherrypicks=${SPACK_CHERRYPICKS//$'\n'/ }" | tee -a $GITHUB_OUTPUT
           echo "cherrypicks_files=${SPACK_CHERRYPICKS_FILES//$'\n'/ }" | tee -a $GITHUB_OUTPUT
       - name: Load spack-packages version and cherry-picks
@@ -91,21 +92,24 @@ jobs:
         run: |
           source spack-packages.sh
           echo "orgrepo=${SPACKPACKAGES_ORGREPO}" | tee -a $GITHUB_OUTPUT
-          echo "version=$(.ci/resolve_git_ref ${SPACKPACKAGES_ORGREPO} ${SPACKPACKAGES_VERSION})" | tee -a $GITHUB_OUTPUT
+          echo "version=${SPACKPACKAGES_VERSION}" | tee -a $GITHUB_OUTPUT
+          echo "sha=$(.ci/resolve_git_ref ${SPACKPACKAGES_ORGREPO} ${SPACKPACKAGES_VERSION})" | tee -a $GITHUB_OUTPUT
           echo "cherrypicks=${SPACKPACKAGES_CHERRYPICKS//$'\n'/ }" | tee -a $GITHUB_OUTPUT
           echo "cherrypicks_files=${SPACKPACKAGES_CHERRYPICKS_FILES//$'\n'/ }" | tee -a $GITHUB_OUTPUT
       - name: Load key4hep-spack version
         id: key4hep-spack
         run: |
           source key4hep-spack.sh
           echo "orgrepo=${KEY4HEPSPACK_ORGREPO}" | tee -a $GITHUB_OUTPUT
-          echo "version=$(.ci/resolve_git_ref ${KEY4HEPSPACK_ORGREPO} ${KEY4HEPSPACK_VERSION})" | tee -a $GITHUB_OUTPUT
+          echo "version=${KEY4HEPSPACK_VERSION}" | tee -a $GITHUB_OUTPUT
+          echo "sha=$(.ci/resolve_git_ref ${KEY4HEPSPACK_ORGREPO} ${KEY4HEPSPACK_VERSION})" | tee -a $GITHUB_OUTPUT
       - name: Load eic-spack version
         id: eic-spack
         run: |
           source eic-spack.sh
           echo "orgrepo=${EICSPACK_ORGREPO}" | tee -a $GITHUB_OUTPUT
-          echo "version=$(.ci/resolve_git_ref ${EICSPACK_ORGREPO} ${EICSPACK_VERSION})" | tee -a $GITHUB_OUTPUT
+          echo "version=${EICSPACK_VERSION}" | tee -a $GITHUB_OUTPUT
+          echo "sha=$(.ci/resolve_git_ref ${EICSPACK_ORGREPO} ${EICSPACK_VERSION})" | tee -a $GITHUB_OUTPUT
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
         with:
@@ -167,16 +171,20 @@ jobs:
             BUILD_IMAGE=${{ matrix.BUILD_IMAGE }}
             SPACK_ORGREPO=${{ steps.spack.outputs.orgrepo }}
             SPACK_VERSION=${{ steps.spack.outputs.version }}
+            SPACK_SHA=${{ steps.spack.outputs.sha }}
             SPACK_CHERRYPICKS=${{ steps.spack.outputs.cherrypicks }}
             SPACK_CHERRYPICKS_FILES=${{ steps.spack.outputs.cherrypicks_files }}
             SPACKPACKAGES_ORGREPO=${{ steps.spack-packages.outputs.orgrepo }}
             SPACKPACKAGES_VERSION=${{ steps.spack-packages.outputs.version }}
+            SPACKPACKAGES_SHA=${{ steps.spack-packages.outputs.sha }}
             SPACKPACKAGES_CHERRYPICKS=${{ steps.spack-packages.outputs.cherrypicks }}
             SPACKPACKAGES_CHERRYPICKS_FILES=${{ steps.spack-packages.outputs.cherrypicks_files }}
             KEY4HEPSPACK_ORGREPO=${{ steps.key4hep-spack.outputs.orgrepo }}
             KEY4HEPSPACK_VERSION=${{ steps.key4hep-spack.outputs.version }}
+            KEY4HEPSPACK_SHA=${{ steps.key4hep-spack.outputs.sha }}
             EICSPACK_ORGREPO=${{ steps.eic-spack.outputs.orgrepo }}
             EICSPACK_VERSION=${{ steps.eic-spack.outputs.version }}
+            EICSPACK_SHA=${{ steps.eic-spack.outputs.sha }}
             jobs=${{ env.JOBS }}
           cache-from: |
             type=registry,ref=${{ env.GH_REGISTRY }}/${{ env.GH_REGISTRY_USER }}/buildcache:${{ matrix.BUILD_IMAGE }}-${{ env.GITHUB_REF_POINT_SLUG }}-${{ matrix.arch }}
@@ -396,13 +404,13 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           outputs: type=image,name=${{ env.GH_REGISTRY }}/${{ env.GH_REGISTRY_USER }}/${{ matrix.BUILD_IMAGE }}${{ matrix.ENV }},push-by-digest=true,name-canonical=true,push=true
           build-args: |
-            BENCHMARK_COM_VERSION=${{ steps.benchmarks.outputs.common_bench }}
-            BENCHMARK_DET_VERSION=${{ steps.benchmarks.outputs.detector_benchmarks }}
-            BENCHMARK_REC_VERSION=${{ steps.benchmarks.outputs.reconstruction_benchmarks }}
-            BENCHMARK_PHY_VERSION=${{ steps.benchmarks.outputs.physics_benchmarks }}
-            CAMPAIGNS_HEPMC3_VERSION=${{ steps.campaigns.outputs.simulation_campaign_hepmc3 }}
-            CAMPAIGNS_CONDOR_VERSION=${{ steps.campaigns.outputs.job_submission_condor }}
-            CAMPAIGNS_SLURM_VERSION=${{ steps.campaigns.outputs.job_submission_slurm }}
+            BENCHMARK_COM_SHA=${{ steps.benchmarks.outputs.common_bench }}
+            BENCHMARK_DET_SHA=${{ steps.benchmarks.outputs.detector_benchmarks }}
+            BENCHMARK_REC_SHA=${{ steps.benchmarks.outputs.reconstruction_benchmarks }}
+            BENCHMARK_PHY_SHA=${{ steps.benchmarks.outputs.physics_benchmarks }}
+            CAMPAIGNS_HEPMC3_SHA=${{ steps.campaigns.outputs.simulation_campaign_hepmc3 }}
+            CAMPAIGNS_CONDOR_SHA=${{ steps.campaigns.outputs.job_submission_condor }}
+            CAMPAIGNS_SLURM_SHA=${{ steps.campaigns.outputs.job_submission_slurm }}
             DOCKER_REGISTRY=${{ env.GH_REGISTRY }}/${{ env.GH_REGISTRY_USER }}/
             BUILDER_IMAGE=${{ matrix.BUILDER_IMAGE }}
             RUNTIME_IMAGE=${{ matrix.RUNTIME_IMAGE }}

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -312,17 +312,21 @@ base:
                    --build-arg BASE_IMAGE=${BASE_IMAGE}
                    --build-arg BUILD_IMAGE=${BUILD_IMAGE}
                    --build-arg SPACK_ORGREPO=${SPACK_ORGREPO}
-                   --build-arg SPACK_VERSION=$(sh .ci/resolve_git_ref "${SPACK_ORGREPO}" "${SPACK_VERSION}")
+                   --build-arg SPACK_VERSION=${SPACK_VERSION}
+                   --build-arg SPACK_SHA=$(sh .ci/resolve_git_ref "${SPACK_ORGREPO}" "${SPACK_VERSION}")
                    --build-arg SPACK_CHERRYPICKS="${SPACK_CHERRYPICKS}"
                    --build-arg SPACK_CHERRYPICKS_FILES="${SPACK_CHERRYPICKS_FILES}"
                    --build-arg SPACKPACKAGES_ORGREPO=${SPACKPACKAGES_ORGREPO}
-                   --build-arg SPACKPACKAGES_VERSION=$(sh .ci/resolve_git_ref "${SPACKPACKAGES_ORGREPO}" "${SPACKPACKAGES_VERSION}")
+                   --build-arg SPACKPACKAGES_VERSION=${SPACKPACKAGES_VERSION}
+                   --build-arg SPACKPACKAGES_SHA=$(sh .ci/resolve_git_ref "${SPACKPACKAGES_ORGREPO}" "${SPACKPACKAGES_VERSION}")
                    --build-arg SPACKPACKAGES_CHERRYPICKS="${SPACKPACKAGES_CHERRYPICKS}"
                    --build-arg SPACKPACKAGES_CHERRYPICKS_FILES="${SPACKPACKAGES_CHERRYPICKS_FILES}"
                    --build-arg KEY4HEPSPACK_ORGREPO=${KEY4HEPSPACK_ORGREPO}
-                   --build-arg KEY4HEPSPACK_VERSION=$(sh .ci/resolve_git_ref "${KEY4HEPSPACK_ORGREPO}" "${KEY4HEPSPACK_VERSION}")
+                   --build-arg KEY4HEPSPACK_VERSION=${KEY4HEPSPACK_VERSION}
+                   --build-arg KEY4HEPSPACK_SHA=$(sh .ci/resolve_git_ref "${KEY4HEPSPACK_ORGREPO}" "${KEY4HEPSPACK_VERSION}")
                    --build-arg EICSPACK_ORGREPO=${EICSPACK_ORGREPO}
-                   --build-arg EICSPACK_VERSION=$(sh .ci/resolve_git_ref "${EICSPACK_ORGREPO}" "${EICSPACK_VERSION}")
+                   --build-arg EICSPACK_VERSION=${EICSPACK_VERSION}
+                   --build-arg EICSPACK_SHA=$(sh .ci/resolve_git_ref "${EICSPACK_ORGREPO}" "${EICSPACK_VERSION}")
                    --build-arg jobs=${JOBS}
                    --provenance false
                    containers/debian
@@ -437,30 +441,30 @@ eic:
                    }
                    --file containers/eic/Dockerfile
                    --platform ${PLATFORM}
-                   --build-arg BENCHMARK_COM_VERSION=$(sh .ci/resolve_git_ref https://eicweb.phy.anl.gov/EIC/benchmarks/common_bench.git master)
-                   --build-arg BENCHMARK_DET_VERSION=$(sh .ci/resolve_git_ref https://eicweb.phy.anl.gov/EIC/benchmarks/detector_benchmarks.git master)
-                   --build-arg BENCHMARK_REC_VERSION=$(sh .ci/resolve_git_ref https://eicweb.phy.anl.gov/EIC/benchmarks/reconstruction_benchmarks.git master)
-                   --build-arg BENCHMARK_PHY_VERSION=$(sh .ci/resolve_git_ref https://eicweb.phy.anl.gov/EIC/benchmarks/physics_benchmarks.git master)
-                   --build-arg CAMPAIGNS_HEPMC3_VERSION=$(sh .ci/resolve_git_ref eic/simulation_campaign_hepmc3 main)
-                   --build-arg CAMPAIGNS_CONDOR_VERSION=$(sh .ci/resolve_git_ref eic/job_submission_condor main)
-                   --build-arg CAMPAIGNS_SLURM_VERSION=$(sh .ci/resolve_git_ref eic/job_submission_slurm main)
+                   --build-arg BENCHMARK_COM_SHA=$(sh .ci/resolve_git_ref https://eicweb.phy.anl.gov/EIC/benchmarks/common_bench.git master)
+                   --build-arg BENCHMARK_DET_SHA=$(sh .ci/resolve_git_ref https://eicweb.phy.anl.gov/EIC/benchmarks/detector_benchmarks.git master)
+                   --build-arg BENCHMARK_REC_SHA=$(sh .ci/resolve_git_ref https://eicweb.phy.anl.gov/EIC/benchmarks/reconstruction_benchmarks.git master)
+                   --build-arg BENCHMARK_PHY_SHA=$(sh .ci/resolve_git_ref https://eicweb.phy.anl.gov/EIC/benchmarks/physics_benchmarks.git master)
+                   --build-arg CAMPAIGNS_HEPMC3_SHA=$(sh .ci/resolve_git_ref eic/simulation_campaign_hepmc3 main)
+                   --build-arg CAMPAIGNS_CONDOR_SHA=$(sh .ci/resolve_git_ref eic/job_submission_condor main)
+                   --build-arg CAMPAIGNS_SLURM_SHA=$(sh .ci/resolve_git_ref eic/job_submission_slurm main)
                    --build-arg DOCKER_REGISTRY=${CI_REGISTRY}/${CI_PROJECT_PATH}/
                    --build-arg BUILDER_IMAGE=${BUILDER_IMAGE}
                    --build-arg RUNTIME_IMAGE=${RUNTIME_IMAGE}
                    --build-arg INTERNAL_TAG=${INTERNAL_TAG}
                    --build-arg EIC_CONTAINER_VERSION=${EXPORT_TAG}-${BUILD_TYPE}-$(git rev-parse HEAD)
                    --build-arg CI_COMMIT_SHA=${CI_COMMIT_SHA}
                    ${IF_BUILD_DEFAULT+
-                     ${EDM4EIC_VERSION:+--build-arg EDM4EIC_VERSION=$(sh .ci/resolve_git_ref eic/EDM4eic ${EDM4EIC_VERSION})}
-                     ${EICRECON_VERSION:+--build-arg EICRECON_VERSION=$(sh .ci/resolve_git_ref eic/EICrecon ${EICRECON_VERSION})}
-                     ${EPIC_VERSION:+--build-arg EPIC_VERSION=$(sh .ci/resolve_git_ref eic/epic ${EPIC_VERSION})}
-                     ${JUGGLER_VERSION:+--build-arg JUGGLER_VERSION=$(sh .ci/resolve_git_ref eic/juggler ${JUGGLER_VERSION})}
+                     ${EDM4EIC_VERSION:+--build-arg EDM4EIC_SHA=$(sh .ci/resolve_git_ref eic/EDM4eic ${EDM4EIC_VERSION})}
+                     ${EICRECON_VERSION:+--build-arg EICRECON_SHA=$(sh .ci/resolve_git_ref eic/EICrecon ${EICRECON_VERSION})}
+                     ${EPIC_VERSION:+--build-arg EPIC_SHA=$(sh .ci/resolve_git_ref eic/epic ${EPIC_VERSION})}
+                     ${JUGGLER_VERSION:+--build-arg JUGGLER_SHA=$(sh .ci/resolve_git_ref eic/juggler ${JUGGLER_VERSION})}
                    }
                    ${IF_BUILD_NIGHTLY+
-                     --build-arg EDM4EIC_VERSION=$(sh .ci/resolve_git_ref eic/EDM4eic ${EDM4EIC_VERSION:-main})
-                     --build-arg EICRECON_VERSION=$(sh .ci/resolve_git_ref eic/EICrecon ${EICRECON_VERSION:-main})
-                     --build-arg EPIC_VERSION=$(sh .ci/resolve_git_ref eic/epic ${EPIC_VERSION:-main})
-                     --build-arg JUGGLER_VERSION=$(sh .ci/resolve_git_ref eic/juggler ${JUGGLER_VERSION:-main})
+                     --build-arg EDM4EIC_SHA=$(sh .ci/resolve_git_ref eic/EDM4eic ${EDM4EIC_VERSION:-main})
+                     --build-arg EICRECON_SHA=$(sh .ci/resolve_git_ref eic/EICrecon ${EICRECON_VERSION:-main})
+                     --build-arg EPIC_SHA=$(sh .ci/resolve_git_ref eic/epic ${EPIC_VERSION:-main})
+                     --build-arg JUGGLER_SHA=$(sh .ci/resolve_git_ref eic/juggler ${JUGGLER_VERSION:-main})
                    }
                    --build-arg ENV=${ENV}
                    --build-arg jobs=${JOBS}

diff --git a/containers/debian/Dockerfile b/containers/debian/Dockerfile
@@ -157,6 +157,7 @@ EOF
 ENV SPACK_ROOT=/opt/spack
 ARG SPACK_ORGREPO="spack/spack"
 ARG SPACK_VERSION="develop"
+ARG SPACK_SHA=""
 ENV SPACK_PYTHON=/usr/bin/python3
 ARG SPACK_CHERRYPICKS=""
 ARG SPACK_CHERRYPICKS_FILES=""
@@ -166,7 +167,7 @@ ARG SPACK_CHERRYPICKS_FILES=""
 RUN <<EOF
 set -e
 git clone --filter=tree:0 https://github.com/${SPACK_ORGREPO}.git ${SPACK_ROOT}
-git -C ${SPACK_ROOT} checkout ${SPACK_VERSION}
+git -C ${SPACK_ROOT} checkout ${SPACK_SHA:-${SPACK_VERSION}}
 if [ -n "${SPACK_CHERRYPICKS}" ] ; then
   SPACK_CHERRYPICKS="${SPACK_CHERRYPICKS// /$'\n'}"
   SPACK_CHERRYPICKS_FILES="${SPACK_CHERRYPICKS_FILES// /$'\n'}"
@@ -195,6 +196,7 @@ SHELL ["docker-shell"]
 ENV SPACKPACKAGES_ROOT=/opt/spack-packages
 ARG SPACKPACKAGES_ORGREPO="spack/spack-packages"
 ARG SPACKPACKAGES_VERSION="develop"
+ARG SPACKPACKAGES_SHA=""
 ARG SPACKPACKAGES_CHERRYPICKS=""
 ARG SPACKPACKAGES_CHERRYPICKS_FILES=""
 # Dockerfile ADD --keep-git-dir clones a shallow copy preventing cherry-picking
@@ -203,7 +205,7 @@ ARG SPACKPACKAGES_CHERRYPICKS_FILES=""
 RUN <<EOF
 set -e
 git clone --filter=tree:0 https://github.com/${SPACKPACKAGES_ORGREPO}.git ${SPACKPACKAGES_ROOT}
-git -C ${SPACKPACKAGES_ROOT} checkout ${SPACKPACKAGES_VERSION}
+git -C ${SPACKPACKAGES_ROOT} checkout ${SPACKPACKAGES_SHA:-${SPACKPACKAGES_VERSION}}
 if [ -n "${SPACKPACKAGES_CHERRYPICKS}" ] ; then
   SPACKPACKAGES_CHERRYPICKS="${SPACKPACKAGES_CHERRYPICKS// /$'\n'}"
   SPACKPACKAGES_CHERRYPICKS_FILES="${SPACKPACKAGES_CHERRYPICKS_FILES// /$'\n'}"
@@ -262,20 +264,22 @@ EOF
 ENV KEY4HEPSPACK_ROOT=${SPACKPACKAGES_ROOT}/repos/key4hep-spack
 ARG KEY4HEPSPACK_ORGREPO="key4hep/key4hep-spack"
 ARG KEY4HEPSPACK_VERSION="main"
+ARG KEY4HEPSPACK_SHA=""
 RUN <<EOF
 set -e
 git clone --filter=tree:0 https://github.com/${KEY4HEPSPACK_ORGREPO}.git ${KEY4HEPSPACK_ROOT}
-git -C ${KEY4HEPSPACK_ROOT} checkout ${KEY4HEPSPACK_VERSION}
+git -C ${KEY4HEPSPACK_ROOT} checkout ${KEY4HEPSPACK_SHA:-${KEY4HEPSPACK_VERSION}}
 spack repo add --scope site "${KEY4HEPSPACK_ROOT}"
 EOF
 
 ## Setup eic-spack (no need for cherry-picks)
 ENV EICSPACK_ROOT=${SPACKPACKAGES_ROOT}/repos/eic-spack
 ARG EICSPACK_ORGREPO="eic/eic-spack"
 ARG EICSPACK_VERSION="develop"
+ARG EICSPACK_SHA=""
 RUN <<EOF
 set -e
 git clone --filter=tree:0 https://github.com/${EICSPACK_ORGREPO}.git ${EICSPACK_ROOT}
-git -C ${EICSPACK_ROOT} checkout ${EICSPACK_VERSION}
+git -C ${EICSPACK_ROOT} checkout ${EICSPACK_SHA:-${EICSPACK_VERSION}}
 spack repo add --scope site "${EICSPACK_ROOT}"
 EOF
diff --git a/containers/eic/Dockerfile b/containers/eic/Dockerfile
@@ -165,30 +165,30 @@ 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"
-ARG EICRECON_VERSION="28108da4a1e8919a05dfdb5f11e114800a2cbe96"
-ARG EPIC_VERSION="c1827f05430b2051df8a0b421db1cbab87165e0b"
-ARG JUGGLER_VERSION="df87bf1f8643afa8e80bece9d36d6dc26dfe8132"
+ARG EDM4EIC_SHA=""
+ARG EICRECON_SHA=""
+ARG EPIC_SHA=""
+ARG JUGGLER_SHA=""
 
 # Concretization (custom environment)
 RUN <<EOF
 set -e
 spack env activate --dir ${SPACK_ENV}
-if [ "${EDM4EIC_VERSION}" != "8aeb507f93a93257c99985efbce0ec1371e0b331" ] ; then
-  sed -i "/# EDM4EIC_VERSION$/ s/@[^' ]*/@git.${EDM4EIC_VERSION}=main/" /opt/spack-environment/packages.yaml
+if [ -n "${EDM4EIC_SHA}" ] ; then
+  sed -i "/# EDM4EIC_VERSION$/ s/@[^' ]*/@git.${EDM4EIC_SHA}=main/" /opt/spack-environment/packages.yaml
   spack deconcretize -y --all edm4eic
 fi
-if [ "${EICRECON_VERSION}" != "28108da4a1e8919a05dfdb5f11e114800a2cbe96" ] ; then
-  sed -i "/# EICRECON_VERSION$/ s/@[^' ]*/@git.${EICRECON_VERSION}=main/" /opt/spack-environment/packages.yaml
+if [ -n "${EICRECON_SHA}" ] ; then
+  sed -i "/# EICRECON_VERSION$/ s/@[^' ]*/@git.${EICRECON_SHA}=main/" /opt/spack-environment/packages.yaml
   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}/epic/spack.yaml
-  sed -i "/# EPIC_VERSION$/ s/epic@main\s/epic@git.${EPIC_VERSION}=main /" /opt/spack-environment/${ENV}/epic/spack.yaml
+if [ -n "${EPIC_SHA}" ] ; then
+  sed -i "/# EPIC_VERSION$/ s/epic\s/epic@git.${EPIC_SHA}=main /" /opt/spack-environment/${ENV}/epic/spack.yaml
+  sed -i "/# EPIC_VERSION$/ s/epic@main\s/epic@git.${EPIC_SHA}=main /" /opt/spack-environment/${ENV}/epic/spack.yaml
   spack deconcretize -y --all epic
 fi
-if [ "${JUGGLER_VERSION}" != "df87bf1f8643afa8e80bece9d36d6dc26dfe8132" ] ; then
-  sed -i "/# JUGGLER_VERSION$/ s/@[^' ]*/@git.${JUGGLER_VERSION}=main/" /opt/spack-environment/packages.yaml
+if [ -n "${JUGGLER_SHA}" ] ; then
+  sed -i "/# JUGGLER_VERSION$/ s/@[^' ]*/@git.${JUGGLER_SHA}=main/" /opt/spack-environment/packages.yaml
   spack deconcretize -y --all juggler
 fi
 spack concretize --force
@@ -370,35 +370,35 @@ spack config blame upstreams
 EOF
 
 ## Install benchmarks into the container
-ARG BENCHMARK_COM_VERSION="master"
-ARG BENCHMARK_DET_VERSION="master"
-ARG BENCHMARK_REC_VERSION="master"
-ARG BENCHMARK_PHY_VERSION="master"
+ARG BENCHMARK_COM_SHA=""
+ARG BENCHMARK_DET_SHA=""
+ARG BENCHMARK_REC_SHA=""
+ARG BENCHMARK_PHY_SHA=""
 RUN <<EOF
 git clone https://eicweb.phy.anl.gov/EIC/benchmarks/common_bench.git /opt/benchmarks/common_bench
-git -C /opt/benchmarks/common_bench checkout ${BENCHMARK_COM_VERSION}
+git -C /opt/benchmarks/common_bench checkout ${BENCHMARK_COM_SHA:-master}
 git clone https://eicweb.phy.anl.gov/EIC/benchmarks/detector_benchmarks.git /opt/benchmarks/detector_benchmarks
-git -C /opt/benchmarks/detector_benchmarks checkout ${BENCHMARK_DET_VERSION}
+git -C /opt/benchmarks/detector_benchmarks checkout ${BENCHMARK_DET_SHA:-master}
 ln -sf /opt/benchmarks/common_bench /opt/benchmarks/detector_benchmarks/.local
 git clone https://eicweb.phy.anl.gov/EIC/benchmarks/reconstruction_benchmarks.git /opt/benchmarks/reconstruction_benchmarks
-git -C /opt/benchmarks/reconstruction_benchmarks checkout ${BENCHMARK_REC_VERSION}
+git -C /opt/benchmarks/reconstruction_benchmarks checkout ${BENCHMARK_REC_SHA:-master}
 ln -sf /opt/benchmarks/common_bench /opt/benchmarks/reconstruction_benchmarks/.local
 git clone https://eicweb.phy.anl.gov/EIC/benchmarks/physics_benchmarks.git /opt/benchmarks/physics_benchmarks
-git -C /opt/benchmarks/physics_benchmarks checkout ${BENCHMARK_PHY_VERSION}
+git -C /opt/benchmarks/physics_benchmarks checkout ${BENCHMARK_PHY_SHA:-master}
 ln -sf /opt/benchmarks/common_bench /opt/benchmarks/physics_benchmarks/.local
 EOF
 
 ## Install campaigns into the container
-ARG CAMPAIGNS_HEPMC3_VERSION="main"
-ARG CAMPAIGNS_CONDOR_VERSION="main"
-ARG CAMPAIGNS_SLURM_VERSION="main"
+ARG CAMPAIGNS_HEPMC3_SHA=""
+ARG CAMPAIGNS_CONDOR_SHA=""
+ARG CAMPAIGNS_SLURM_SHA=""
 RUN <<EOF
 git clone https://github.com/eic/simulation_campaign_hepmc3.git /opt/campaigns/hepmc3
-git -C /opt/campaigns/hepmc3 checkout ${CAMPAIGNS_HEPMC3_VERSION}
+git -C /opt/campaigns/hepmc3 checkout ${CAMPAIGNS_HEPMC3_SHA:-main}
 git clone https://github.com/eic/job_submission_condor.git /opt/campaigns/condor
-git -C /opt/campaigns/condor checkout ${CAMPAIGNS_CONDOR_VERSION}
+git -C /opt/campaigns/condor checkout ${CAMPAIGNS_CONDOR_SHA:-main}
 git clone https://github.com/eic/job_submission_slurm.git /opt/campaigns/slurm
-git -C /opt/campaigns/slurm checkout ${CAMPAIGNS_SLURM_VERSION}
+git -C /opt/campaigns/slurm checkout ${CAMPAIGNS_SLURM_SHA:-main}
 EOF
 
 ## make sure we have the entrypoints setup correctly