.gitlab-ci.yml

@@ -248,14 +248,17 @@ jug_dev:default:
   parallel:
     matrix:
       - BASE_IMAGE: debian_stable_base
-        BUILD_IMAGE: jug_dev
+        BUILD_IMAGE: jug_
         PLATFORM: linux/amd64,linux/arm64/v8
+        ENV: [dev, prod]
 #      - BASE_IMAGE: oneapi_base
 #        BUILD_IMAGE: jug_dev_oneapi
 #        PLATFORM: linux/amd64
+#        ENV: [prod]
 #      - BASE_IMAGE: cuda_base_new
 #        BUILD_IMAGE: jug_dev_cuda
 #        PLATFORM: linux/amd64
+#        ENV: [prod]
   extends: .build
   stage: jug
   needs:
@@ -267,11 +270,11 @@ jug_dev:default:
       export SPACK_VERSION ;
       cat mirrors.yaml.in | envsubst > mirrors.yaml ;
       docker buildx build --push ${BUILD_OPTIONS}
-                   --tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}:${INTERNAL_TAG}
+                   --tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}${ENV}:${INTERNAL_TAG}
                    ${EXPORT_TAG:+
-                     ${CI_PUSH:+--tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}:${EXPORT_TAG}}
-                     ${DH_PUSH:+--tag ${DH_REGISTRY}/${DH_REGISTRY_USER}/${BUILD_IMAGE}:${EXPORT_TAG}}
-                     ${GH_PUSH:+--tag ${GH_REGISTRY}/${GH_REGISTRY_USER}/${BUILD_IMAGE}:${EXPORT_TAG}}
+                     ${CI_PUSH:+--tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}${ENV}:${EXPORT_TAG}}
+                     ${DH_PUSH:+--tag ${DH_REGISTRY}/${DH_REGISTRY_USER}/${BUILD_IMAGE}${ENV}:${EXPORT_TAG}}
+                     ${GH_PUSH:+--tag ${GH_REGISTRY}/${GH_REGISTRY_USER}/${BUILD_IMAGE}${ENV}:${EXPORT_TAG}}
                    }
                    --file containers/jug/dev.Dockerfile
                    --platform ${PLATFORM}
@@ -287,6 +290,7 @@ jug_dev:default:
                    --build-arg S3_ACCESS_KEY=${S3_ACCESS_KEY}
                    --build-arg S3_SECRET_KEY=${S3_SECRET_KEY}
                    --build-arg JUG_VERSION=${INTERNAL_TAG}-$(git rev-parse HEAD)
+                   --build-arg ENV=${ENV}
                    --build-arg jobs=${JOBS}
                    --build-context spack-environment=spack-environment
                    --secret id=mirrors,src=mirrors.yaml

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.9"
+EICSPACK_VERSION="v0.20.10"
 
 ## Space-separated list of eic-spack cherry-picks
 read -r -d '' EICSPACK_CHERRYPICKS <<- \

spack-environment/packages.yaml

@@ -108,7 +108,7 @@ packages:
   geant4:
     require:
     - '@11.1.1'
-    - cxxstd=17 +opengl -vecgeom +x11 +qt +threads
+    - cxxstd=17 +opengl -vecgeom +x11 +qt +threads -vtk
   graphviz:
     require:
     - '@8.0.1'
@@ -130,7 +130,7 @@ packages:
     - '@1.0.6'
   jana2:
     require:
-    - '@2.1.0'
+    - '@2.1.1'
     - -ipo +podio +root +zmq
   lcov:
     require:
@@ -159,6 +159,7 @@ packages:
   opencascade:
     require:
     - '@7.7.1'
+    - -vtk
   osg-ca-certs:
     require:
     - '@1.109.igtf.1.117'

spack-environment/prod/spack.yaml

+spack:
+  include: 
+  - ../concretizer.yaml
+  - ../packages.yaml
+  specs:
+    - acts
+    - cmake
+    - dd4hep
+    - edm4eic
+    - fastjet
+    - fjcontrib
+    - gaudi
+    - geant4
+    - hepmc3
+    - intel-tbb
+    - irt
+    - jana2
+    - npsim
+    - py-boto3
+    - py-jinja2
+    - py-jinja2-cli
+    - py-pip
+    - root
+    - xrootd
+  view: false

spack.sh

@@ -12,6 +12,12 @@ read -r -d '' SPACK_CHERRYPICKS <<- \
 776ab132760d63eab0703b7c0ebebc72a8443f5b
 188168c476eabe99764634db8d78eb3f9ea2a927
 b3268c2703b84f4e4961c1e2cdf43e8998f283e6
+4ae1a73d54b33bc4876535422d3f3bf3d9641c51
+9e4c4be3f523a0d144870dbf5645ad7bf0ff04be
+d8a9b42da6cdef3a08ec48931bf282e5e4811d38
+ce0b9ea8cf184c9048cac1ae88f2d69f0e4520c7
+ea1439dfa11a3996c9927ed792dc9fe4b7efc1b8
+5996aaa4e3b8b37f847da356489bb27958b968f1
 ---
 ## Ref: https://github.com/spack/spack/commit/[hash]
 ## [hash]: [description]
@@ -19,3 +25,9 @@ b3268c2703b84f4e4961c1e2cdf43e8998f283e6
 ## 776ab132760d63eab0703b7c0ebebc72a8443f5b: [xrootd] New variants, new version, improve build config
 ## 188168c476eabe99764634db8d78eb3f9ea2a927: podio: Add 0.16.5 tag
 ## b3268c2703b84f4e4961c1e2cdf43e8998f283e6: freetype: add pic and shared variants
+## 4ae1a73d54b33bc4876535422d3f3bf3d9641c51: (r-rcpp)ensmallen: new package
+## 9e4c4be3f523a0d144870dbf5645ad7bf0ff04be: mlpack: new package
+## d8a9b42da6cdef3a08ec48931bf282e5e4811d38: actsvg: add v0.4.33
+## ce0b9ea8cf184c9048cac1ae88f2d69f0e4520c7: acts: ensure Python_EXECUTABLE uses ^python when +python
+## ea1439dfa11a3996c9927ed792dc9fe4b7efc1b8: acts: new variant cxxstd
+## 5996aaa4e3b8b37f847da356489bb27958b968f1: acts: new versions 23.[3-5].0, 24.0.0, 25.0.[0-1], 26.0.0, 27.[0-1].0, 28.0.0