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

feat: use official singularity image

parent 61d28076
No related branches found
No related tags found
1 merge request!701feat: use official singularity image
image: eicweb.phy.anl.gov:4567/containers/image_recipes/ubuntu_dind:latest image: eicweb.phy.anl.gov:4567/containers/image_recipes/ubuntu_dind:latest
variables: variables:
## External images
DOCKER_IMAGE: docker.io/docker:24.0.5
SINGULARITY_IMAGE: quay.io/singularity/singularity:v3.11.4
## Application versions used for the main release ## Application versions used for the main release
## note: nightly builds will always use the master/main branch ## note: nightly builds will always use the master/main branch
JUGGLER_VERSION: "v10.0.1" JUGGLER_VERSION: "v10.0.1"
...@@ -406,51 +410,45 @@ jug_xl:nightly: ...@@ -406,51 +410,45 @@ jug_xl:nightly:
--build-context detectors=. --build-context detectors=.
containers/jug containers/jug
.singularity: .singularity:
image:
name: ${SINGULARITY_IMAGE}
entrypoint: [""]
stage: deploy stage: deploy
interruptible: true interruptible: true
rules: rules:
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"' - if: '$CI_COMMIT_BRANCH == "master"'
when: never when: on_success
- when: never
artifacts: artifacts:
expire_in: 1 days expire_in: 1 days
paths: paths:
- build/${BUILD_IMAGE}.sif - build/${BUILD_IMAGE}.sif
before_script: ""
script: script:
- mkdir build - mkdir build
- singularity pull build/${BUILD_IMAGE}.sif docker://${CI_REGISTRY_IMAGE}/${BUILD_IMAGE}:${INTERNAL_TAG} - singularity pull build/${BUILD_IMAGE}.sif docker://${CI_REGISTRY_IMAGE}/${BUILD_IMAGE}:${INTERNAL_TAG}-${BUILD_TYPE}
after_script: ""
jug_dev:singularity:default:
extends: .singularity
needs:
- version
- jug_dev
variables:
BUILD_IMAGE: "jug_dev"
jug_xl:singularity:default: jug_xl:singularity:default:
extends: .singularity extends: .singularity
variables:
BUILD_TYPE: default
BUILD_IMAGE: jug_xl
needs: needs:
- version - version
- jug_xl:default - jug_xl:default
variables:
BUILD_IMAGE: "jug_xl"
# eic-shell expects build/jug_xl.sif from the job with name 'jug_xl:singularity:nightly'
jug_xl:singularity:nightly: jug_xl:singularity:nightly:
extends: .singularity extends: .singularity
rules: variables:
- !reference ['.singularity', rules] BUILD_TYPE: nightly
- if: '$CI_COMMIT_BRANCH == "master"' BUILD_IMAGE: jug_xl
when: on_success
- when: never
needs: needs:
- version - version
- jug_xl:nightly - jug_xl:nightly
variables:
BUILD_IMAGE: "jug_xl"
script:
- mkdir build
- singularity pull build/${BUILD_IMAGE}.sif docker://${CI_REGISTRY_IMAGE}/${BUILD_IMAGE}:${NIGHTLY_TAG}
benchmarks:reconstruction:default: benchmarks:reconstruction:default:
stage: benchmarks stage: benchmarks
......
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