Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
eic_container
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
containers
eic_container
Commits
61e9fe0e
Commit
61e9fe0e
authored
3 months ago
by
Wouter Deconinck
Browse files
Options
Downloads
Patches
Plain Diff
fix: rm eics3(rw)? mirror
parent
11babe7f
No related branches found
No related tags found
1 merge request
!1039
fix: rm eics3(rw)? mirror
Pipeline
#107171
passed
3 months ago
Stage: status-pending
Stage: config
Stage: base
Stage: eic
Stage: deploy
Stage: benchmarks
Stage: finalize
Stage: status-report
Pipeline: reconstruction_benchmarks
#107188
Pipeline: reconstruction_benchmarks
#107187
Pipeline: eic_container: fix: rm eics3(rw)? mirror
#107186
+3
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.gitlab-ci.yml
+0
-2
0 additions, 2 deletions
.gitlab-ci.yml
containers/debian/base.Dockerfile
+0
-9
0 additions, 9 deletions
containers/debian/base.Dockerfile
mirrors.yaml.in
+0
-15
0 additions, 15 deletions
mirrors.yaml.in
spack-environment/Makefile
+0
-3
0 additions, 3 deletions
spack-environment/Makefile
with
0 additions
and
29 deletions
.gitlab-ci.yml
+
0
−
2
View file @
61e9fe0e
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
containers/debian/base.Dockerfile
+
0
−
9
View file @
61e9fe0e
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
mirrors.yaml.in
+
0
−
15
View file @
61e9fe0e
...
@@ -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
This diff is collapsed.
Click to expand it.
spack-environment/Makefile
+
0
−
3
View file @
61e9fe0e
...
@@ -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/%
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment