diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2d3005cf9627ca9be5fea367e0822e86e9dce9bd..ab717018bb519bd1b64bb02f928e4eeb1022245d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,6 +7,7 @@ variables: ## Application versions used for the main release ## note: nightly builds will always use the master/main branch + JUGGLER_VERSION: "v11.0.0" EICRECON_VERSION: "v1.8.0" ## Local registry @@ -336,6 +337,7 @@ jug_dev: --build-arg S3_SECRET_KEY=${S3_SECRET_KEY} --build-arg JUG_VERSION=${EXPORT_TAG}-${BUILD_TYPE}-$(git rev-parse HEAD) ${IF_BUILD_DEFAULT:+ + --build-arg JUGGLER_VERSION=${JUGGLER_VERSION} --build-arg EICRECON_VERSION=${EICRECON_VERSION} } --build-arg ENV=${ENV} diff --git a/containers/jug/dev.Dockerfile b/containers/jug/dev.Dockerfile index 79523c2788626fdc33e7c48cdda8a431864bd989..5306d30a5a6441c2a84930b7977b8088773355b1 100644 --- a/containers/jug/dev.Dockerfile +++ b/containers/jug/dev.Dockerfile @@ -132,6 +132,8 @@ FROM spack as builder ## Setup our custom environment (secret mount for write-enabled mirror) 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 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} @@ -144,6 +146,7 @@ export CCACHE_DIR=/ccache spack buildcache update-index local spack buildcache update-index eics3rw spack env activate --dir ${SPACK_ENV} +spack add juggler@git.${JUGGLER_VERSION} spack add eicrecon@git.${EICRECON_VERSION} spack concretize --fresh --force --quiet make --jobs ${jobs} --keep-going --directory /opt/spack-environment SPACK_ENV=${SPACK_ENV} BUILDCACHE_MIRROR="local eics3rw"