From 605ae922025d40552337922fd705816dc9eca48c Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Fri, 16 Jun 2023 15:59:27 +0000
Subject: [PATCH] feat: SPACK_VERSION in eics3 mirror

---
 containers/jug/dev.Dockerfile | 2 +-
 mirrors.yaml.in               | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/containers/jug/dev.Dockerfile b/containers/jug/dev.Dockerfile
index 5b6ad8963..48a310244 100644
--- a/containers/jug/dev.Dockerfile
+++ b/containers/jug/dev.Dockerfile
@@ -78,7 +78,7 @@ RUN --mount=type=cache,target=/var/cache/spack-mirror                   \
       --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                                     \
+      eics3 s3://eictest/EPIC/spack/${SPACK_VERSION}                    \
     ; fi                                                                \
  && spack mirror list
 
diff --git a/mirrors.yaml.in b/mirrors.yaml.in
index 73904d3e0..369db4061 100644
--- a/mirrors.yaml.in
+++ b/mirrors.yaml.in
@@ -1,7 +1,7 @@
 mirrors:
   eics3rw:
     fetch:
-      url: s3://eictest/EPIC/spack
+      url: s3://eictest/EPIC/spack/${SPACK_VERSION}
       access_pair:
       - ${S3RW_ACCESS_KEY}
       - ${S3RW_SECRET_KEY}
@@ -9,7 +9,7 @@ mirrors:
       profile: null
       endpoint_url: https://eics3.sdcc.bnl.gov:9000
     push:
-      url: s3://eictest/EPIC/spack
+      url: s3://eictest/EPIC/spack/${SPACK_VERSION}
       access_pair:
       - ${S3RW_ACCESS_KEY}
       - ${S3RW_SECRET_KEY}
-- 
GitLab