From 61e9fe0e2b5a747557264f72104766889f5ce027 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Thu, 21 Nov 2024 01:31:43 +0000
Subject: [PATCH] fix: rm eics3(rw)? mirror
---
.gitlab-ci.yml | 2 --
containers/debian/base.Dockerfile | 9 ---------
mirrors.yaml.in | 15 ---------------
spack-environment/Makefile | 3 ---
4 files changed, 29 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5a3b427c8..870020c63 100644
--- a/.gitlab-ci.yml
+++ b/.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
diff --git a/containers/debian/base.Dockerfile b/containers/debian/base.Dockerfile
index e05fad6db..b2632eb35 100644
--- a/containers/debian/base.Dockerfile
+++ b/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
diff --git a/mirrors.yaml.in b/mirrors.yaml.in
index 5b89a7b01..6c0fdc5c7 100644
--- a/mirrors.yaml.in
+++ b/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
diff --git a/spack-environment/Makefile b/spack-environment/Makefile
index 0362629b2..6aa7ab773 100644
--- a/spack-environment/Makefile
+++ b/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/%
--
GitLab