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
ec0a337f
Commit
ec0a337f
authored
1 year ago
by
Wouter Deconinck
Browse files
Options
Downloads
Patches
Plain Diff
feat: allow external trigger with edm4eic version
parent
9a71f16a
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!873
feat: allow external trigger with edm4eic version
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+6
-3
6 additions, 3 deletions
.gitlab-ci.yml
containers/jug/dev.Dockerfile
+14
-7
14 additions, 7 deletions
containers/jug/dev.Dockerfile
with
20 additions
and
10 deletions
.gitlab-ci.yml
+
6
−
3
View file @
ec0a337f
...
...
@@ -7,8 +7,9 @@ variables:
## Default versions are specified in packages.yaml but can be overridden
## note: nightly builds will always use the master/main branch
JUGGLER
_VERSION
:
"
"
EDM4EIC
_VERSION
:
"
"
EICRECON_VERSION
:
"
"
JUGGLER_VERSION
:
"
"
## Local registry
CI_PUSH
:
1
...
...
@@ -362,12 +363,14 @@ jug_dev:
--build-arg S3_SECRET_KEY=${S3_SECRET_KEY}
--build-arg JUG_VERSION=${EXPORT_TAG}-${BUILD_TYPE}-$(git rev-parse HEAD)
${IF_BUILD_DEFAULT:+
${
JUGGLER
_VERSION:+--build-arg
JUGGLER
_VERSION=${
JUGGLER
_VERSION}}
${
EDM4EIC
_VERSION:+--build-arg
EDM4EIC
_VERSION=${
EDM4EIC
_VERSION}}
${EICRECON_VERSION:+--build-arg EICRECON_VERSION=${EICRECON_VERSION}}
${JUGGLER_VERSION:+--build-arg JUGGLER_VERSION=${JUGGLER_VERSION}}
}
${IF_BUILD_NIGHTLY:+
--build-arg
JUGGLER
_VERSION=main
--build-arg
EDM4EIC
_VERSION=main
--build-arg EICRECON_VERSION=main
--build-arg JUGGLER_VERSION=main
}
--build-arg ENV=${ENV}
--build-arg jobs=${JOBS}
...
...
This diff is collapsed.
Click to expand it.
containers/jug/dev.Dockerfile
+
14
−
7
View file @
ec0a337f
...
...
@@ -163,10 +163,12 @@ EOF
## 2. Setup our environment with custom versions (on top of cached layer)
## Note: these default versions are just the very first commit.
ARG
JUGGLER
_VERSION="
df87bf1f8643afa8e80bece9d36d6dc26dfe8132
"
ARG
EDM4EIC
_VERSION="
8aeb507f93a93257c99985efbce0ec1371e0b331
"
ARG
EICRECON_VERSION="28108da4a1e8919a05dfdb5f11e114800a2cbe96"
ADD
https://api.github.com/repos/eic/juggler/commits/${JUGGLER_VERSION} /tmp/juggler.json
ARG
JUGGLER_VERSION="df87bf1f8643afa8e80bece9d36d6dc26dfe8132"
ADD
https://api.github.com/repos/eic/edm4eic/commits/${EDM4EIC_VERSION} /tmp/edm4eic.json
ADD
https://api.github.com/repos/eic/eicrecon/commits/${EICRECON_VERSION} /tmp/eicrecon.json
ADD
https://api.github.com/repos/eic/juggler/commits/${JUGGLER_VERSION} /tmp/juggler.json
RUN
--mount
=
type
=
cache,target
=
/ccache,id
=
${
TARGETPLATFORM
}
\
--mount
=
type
=
cache,target
=
/var/cache/spack
\
--mount
=
type
=
secret,id
=
mirrors,target
=
/opt/spack/etc/spack/mirrors.yaml
\
...
...
@@ -175,15 +177,20 @@ source ${SPACK_ROOT}/share/spack/setup-env.sh
export CCACHE_DIR=/ccache
spack buildcache update-index eics3rw
spack env activate --dir ${SPACK_ENV}
if [ "${
JUGGLER
_VERSION}" != "
df87bf1f8643afa8e80bece9d36d6dc26dfe8132
" ] ; then
export
JUGGLER
_VERSION=$(jq -r .sha /tmp/
juggler
.json)
spack config add "packages:
juggler
::require:['@git.${
JUGGLER
_VERSION}=main']"
spack deconcretize -y
juggler
if [ "${
EDM4EIC
_VERSION}" != "
8aeb507f93a93257c99985efbce0ec1371e0b331
" ] ; then
export
EDM4EIC
_VERSION=$(jq -r .sha /tmp/
edm4eic
.json)
spack config add "packages:
edm4eic
::require:['@git.${
EDM4EIC
_VERSION}=main']"
spack deconcretize -y
--all edm4eic
fi
if [ "${EICRECON_VERSION}" != "28108da4a1e8919a05dfdb5f11e114800a2cbe96" ] ; then
export EICRECON_VERSION=$(jq -r .sha /tmp/eicrecon.json)
spack config add "packages:eicrecon::require:['@git.${EICRECON_VERSION}=main']"
spack deconcretize -y eicrecon
spack deconcretize -y --all eicrecon
fi
if [ "${JUGGLER_VERSION}" != "df87bf1f8643afa8e80bece9d36d6dc26dfe8132" ] ; then
export JUGGLER_VERSION=$(jq -r .sha /tmp/juggler.json)
spack config add "packages:juggler::require:['@git.${JUGGLER_VERSION}=main']"
spack deconcretize -y --all juggler
fi
spack concretize --fresh --force --quiet
make --jobs ${jobs} --keep-going --directory /opt/spack-environment \
...
...
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