Skip to content
Snippets Groups Projects
Commit 61e9fe0e authored by Wouter Deconinck's avatar Wouter Deconinck
Browse files

fix: rm eics3(rw)? mirror

parent 11babe7f
No related branches found
No related tags found
1 merge request!1039fix: rm eics3(rw)? mirror
Pipeline #107171 passed
Pipeline: reconstruction_benchmarks

#107188

    Pipeline: reconstruction_benchmarks

    #107187

      Pipeline: eic_container: fix: rm eics3(rw)? mirror

      #107186

        +3
        ...@@ -295,8 +295,6 @@ base: ...@@ -295,8 +295,6 @@ base:
        --build-arg KEY4HEPSPACK_VERSION=${KEY4HEPSPACK_VERSION} --build-arg KEY4HEPSPACK_VERSION=${KEY4HEPSPACK_VERSION}
        --build-arg EICSPACK_ORGREPO=${EICSPACK_ORGREPO} --build-arg EICSPACK_ORGREPO=${EICSPACK_ORGREPO}
        --build-arg EICSPACK_VERSION=${EICSPACK_VERSION} --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} --build-arg jobs=${JOBS}
        --provenance false --provenance false
        containers/debian containers/debian
        ......
        ...@@ -202,17 +202,8 @@ EOF ...@@ -202,17 +202,8 @@ EOF
        ## Setup buildcache mirrors ## Setup buildcache mirrors
        ## - this always adds the read-only mirror to the container ## - this always adds the read-only mirror to the container
        ## - the write-enabled mirror is provided later as a secret mount ## - 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 RUN --mount=type=cache,target=/var/cache/spack <<EOF
        set -e 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 --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 add --scope site --unsigned ghcr-${SPACK_VERSION} oci://ghcr.io/eic/spack-${SPACK_VERSION}
        spack mirror list spack mirror list
        ......
        ...@@ -23,18 +23,3 @@ mirrors: ...@@ -23,18 +23,3 @@ mirrors:
        access_pair: access_pair:
        - ${GITHUB_REGISTRY_USER} - ${GITHUB_REGISTRY_USER}
        - ${GITHUB_REGISTRY_TOKEN} - ${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
        ...@@ -7,7 +7,6 @@ export SPACK_COLOR = always ...@@ -7,7 +7,6 @@ export SPACK_COLOR = always
        SPACK_ENV ?= dev SPACK_ENV ?= dev
        BUILDCACHE_S3_FINAL :=
        BUILDCACHE_OCI_FINAL := BUILDCACHE_OCI_FINAL :=
        BUILDCACHE_OCI_BASE_IMAGE := ghcr.io/eic/debian:stable-slim BUILDCACHE_OCI_BASE_IMAGE := ghcr.io/eic/debian:stable-slim
        ...@@ -20,8 +19,6 @@ include $(SPACK_ENV)/spack.mk ...@@ -20,8 +19,6 @@ include $(SPACK_ENV)/spack.mk
        endif endif
        $(SPACK_ENV)/push: $(addprefix $(SPACK_ENV)/push/,$($(SPACK_ENV)/SPACK_PACKAGE_IDS)) $(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" ;) $(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_ENV)/push/%: $(SPACK_ENV)/install/%
        ......
        0% Loading or .
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment