.gitlab-ci.yml

@@ -507,7 +507,7 @@ benchmarks:detector:default:
   trigger:
     project: EIC/benchmarks/detector_benchmarks
     strategy: depend
-  allow_failure: true
+  allow_failure: false
   
 benchmarks:detector:nightly:
   stage: benchmarks
@@ -526,7 +526,7 @@ benchmarks:detector:nightly:
   trigger:
     project: EIC/benchmarks/detector_benchmarks
     strategy: depend
-  allow_failure: true
+  allow_failure: false
   
 clean_internal_tag:
   image: alpine/curl

containers/jug/dev.Dockerfile

@@ -20,6 +20,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=${TARGETPLATFORM}
 rm -f /etc/apt/apt.conf.d/docker-clean
 apt-get -yqq update
 apt-get -yqq install --no-install-recommends                            \
+        jq                                                              \
         python3                                                         \
         python3-dev                                                     \
         python3-distutils                                               \
@@ -126,7 +127,7 @@ FROM spack as builder
 COPY --from=spack-environment . /opt/spack-environment/
 ARG ENV=dev
 ARG JUGGLER_VERSION="main"
-ADD https://eicweb.phy.anl.gov/api/v4/projects/EIC%2Fjuggler/repository/tree?ref=${JUGGLER_VERSION} /tmp/juggler.json
+ADD https://eicweb.phy.anl.gov/api/v4/projects/EIC%2Fjuggler/repository/commits/${JUGGLER_VERSION} /tmp/juggler.json
 ARG EICRECON_VERSION="main"
 ADD https://api.github.com/repos/eic/eicrecon/commits/${EICRECON_VERSION} /tmp/eicrecon.json
 ENV SPACK_ENV=/opt/spack-environment/${ENV}
@@ -137,6 +138,8 @@ RUN --mount=type=cache,target=/ccache,id=${TARGETPLATFORM}              \
 set -e
 export CCACHE_DIR=/ccache
 find /var/cache/spack/blobs/sha256/ -atime +7 -delete
+JUGGLER_VERSION=$(jq -r .id /tmp/juggler.json)
+EICRECON_VERSION=$(jq -r .sha /tmp/eicrecon.json)
 spack buildcache update-index eics3rw
 spack env activate --dir ${SPACK_ENV}
 spack add juggler@git.${JUGGLER_VERSION}
@@ -289,10 +292,10 @@ ARG BENCHMARK_DET_VERSION="master"
 ARG BENCHMARK_REC_VERSION="master"
 ARG BENCHMARK_PHY_VERSION="master"
 ## cache bust when updated repositories
-ADD ${EICWEB}/458/repository/tree?ref=${BENCHMARK_COM_VERSION} /tmp/485.json
-ADD ${EICWEB}/399/repository/tree?ref=${BENCHMARK_DET_VERSION} /tmp/399.json
-ADD ${EICWEB}/408/repository/tree?ref=${BENCHMARK_REC_VERSION} /tmp/408.json 
-ADD ${EICWEB}/400/repository/tree?ref=${BENCHMARK_PHY_VERSION} /tmp/400.json
+ADD ${EICWEB}/458/repository/commits/${BENCHMARK_COM_VERSION} /tmp/485.json
+ADD ${EICWEB}/399/repository/commits/${BENCHMARK_DET_VERSION} /tmp/399.json
+ADD ${EICWEB}/408/repository/commits/${BENCHMARK_REC_VERSION} /tmp/408.json 
+ADD ${EICWEB}/400/repository/commits/${BENCHMARK_PHY_VERSION} /tmp/400.json
 RUN <<EOF
 set -ex
 mkdir -p /opt/benchmarks

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="4c9c1250d054e587455e5f00df242e376018130a"
+EICSPACK_VERSION="f3e18d6a2273029d16462575fe6cc4f4e1efeee0"
 
 ## Space-separated list of eic-spack cherry-picks
 read -r -d '' EICSPACK_CHERRYPICKS <<- \

spack-environment/dev/spack.yaml

@@ -39,6 +39,7 @@ spack:
   - irt
   - iwyu
   - jana2
+  - k4actstracking
   - k4fwcore
   - lcov
   - lhapdf

spack-environment/packages.yaml

@@ -161,6 +161,9 @@ packages:
   juggler:
     require:
     - cxxstd=20
+  k4actstracking:
+    require:
+    - '@main'
   k4fwcore:
     require:
     - '@1.0pre17'