.gitlab-ci.yml

@@ -295,8 +295,6 @@ base:
                    --build-arg KEY4HEPSPACK_VERSION=${KEY4HEPSPACK_VERSION}
                    --build-arg EICSPACK_ORGREPO=${EICSPACK_ORGREPO}
                    --build-arg EICSPACK_VERSION=${EICSPACK_VERSION}
-                   --build-arg S3_ACCESS_KEY=${S3_ACCESS_KEY}
-                   --build-arg S3_SECRET_KEY=${S3_SECRET_KEY}
                    --build-arg jobs=${JOBS}
                    --provenance false
                    containers/debian

containers/debian/base.Dockerfile

@@ -202,17 +202,8 @@ EOF
 ## Setup buildcache mirrors
 ## - this always adds the read-only mirror to the container
 ## - the write-enabled mirror is provided later as a secret mount
-ARG S3_ACCESS_KEY=""
-ARG S3_SECRET_KEY=""
 RUN --mount=type=cache,target=/var/cache/spack <<EOF
 set -e
-if [ -n "${S3_ACCESS_KEY}" ] ; then
-  spack mirror add --scope site --unsigned                              \
-      --s3-endpoint-url https://eics3.sdcc.bnl.gov:9000                 \
-      --s3-access-key-id "${S3_ACCESS_KEY}"                             \
-      --s3-access-key-secret "${S3_SECRET_KEY}"                         \
-      eics3 s3://eictest/EPIC/spack/${SPACK_VERSION}
-fi
 spack mirror add --scope site --signed spack-${SPACK_VERSION} https://binaries.spack.io/${SPACK_VERSION}
 spack mirror add --scope site --unsigned ghcr-${SPACK_VERSION} oci://ghcr.io/eic/spack-${SPACK_VERSION}
 spack mirror list

mirrors.yaml.in

@@ -23,18 +23,3 @@ mirrors:
       access_pair:
       - ${GITHUB_REGISTRY_USER}
       - ${GITHUB_REGISTRY_TOKEN}
-  eics3rw:
-    autopush: false
-    signed: false
-    fetch:
-      url: s3://eictest/EPIC/spack/${SPACK_VERSION}
-      access_pair:
-      - ${S3RW_ACCESS_KEY}
-      - ${S3RW_SECRET_KEY}
-      endpoint_url: https://eics3.sdcc.bnl.gov:9000
-    push:
-      url: s3://eictest/EPIC/spack/${SPACK_VERSION}
-      access_pair:
-      - ${S3RW_ACCESS_KEY}
-      - ${S3RW_SECRET_KEY}
-      endpoint_url: https://eics3.sdcc.bnl.gov:9000

spack-environment/Makefile

@@ -7,7 +7,6 @@ export SPACK_COLOR = always
 
 SPACK_ENV ?= dev
 
-BUILDCACHE_S3_FINAL :=
 BUILDCACHE_OCI_FINAL :=
 BUILDCACHE_OCI_BASE_IMAGE := ghcr.io/eic/debian:stable-slim
 
@@ -20,8 +19,6 @@ include $(SPACK_ENV)/spack.mk
 endif
 
 $(SPACK_ENV)/push: $(addprefix $(SPACK_ENV)/push/,$($(SPACK_ENV)/SPACK_PACKAGE_IDS))
-	$(foreach buildcache, $(BUILDCACHE_S3_FINAL), $(SPACK) buildcache push --private --unsigned $(buildcache) ;)
-	$(foreach buildcache, $(BUILDCACHE_S3_FINAL), $(SPACK) buildcache update-index $(buildcache) ;)
 	$(foreach buildcache, $(BUILDCACHE_OCI_FINAL), $(SPACK) buildcache push --private --unsigned --base-image $(BUILDCACHE_OCI_BASE_IMAGE) $(buildcache) | grep -v "Using cached archive" ;)
 
 $(SPACK_ENV)/push/%: $(SPACK_ENV)/install/%

spack-environment/packages.yaml

@@ -62,7 +62,7 @@ packages:
     - '@2.3.2'
   cmake:
     require:
-    - '@3.27.9'
+    - '@3.30.5'
   cnpy:
     require:
     - '@master'
@@ -166,7 +166,7 @@ packages:
     - glx
   gloo:
     require:
-    - '@2023-05-19'
+    - '@2023-12-03'
   graphviz:
     require:
     - '@12.1.0'
@@ -225,7 +225,7 @@ packages:
     - '@5.08.01'
   mesa:
     require:
-    - '@22.1.6'
+    - '@23.3.6'
     - +glx +llvm +opengl +opengles +osmesa
   nlohmann-json:
     require:
@@ -284,7 +284,7 @@ packages:
     - +batch +xrootd
   pythia8:
     require:
-    - '@8.311'
+    - '@8.312'
     - +fastjet +root
   python:
     require:
@@ -387,7 +387,7 @@ packages:
     - '@0.10.2'
   py-torch:
     require:
-    - '@2.1.0'
+    - '@2.5.1'
     - -mkldnn
   py-uproot:
     require: