From 49097f0d0c8b7b890e63571879315e3c35d8aaa3 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Wed, 23 Aug 2023 16:02:55 +0000
Subject: [PATCH] fix: singularity correct matrix
---
.gitlab-ci.yml | 47 +++++++++++++++++++++++------------------------
1 file changed, 23 insertions(+), 24 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 851f624a0..503037ce9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -410,6 +410,7 @@ jug_xl:nightly:
--build-context detectors=.
containers/jug
+
.singularity:
image:
name: ${SINGULARITY_IMAGE}
@@ -418,7 +419,10 @@ jug_xl:nightly:
interruptible: true
rules:
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
- when: always
+ when: on_success
+ - if: '$CI_COMMIT_BRANCH == "master"'
+ when: on_success
+ - when: never
artifacts:
expire_in: 1 days
paths:
@@ -426,40 +430,35 @@ jug_xl:nightly:
before_script: ""
script:
- 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:
+jug_dev:singularity:
+ parallel:
+ matrix:
+ - BUILD_TYPE:
+ - default
+ - nightly
+ BUILD_IMAGE:
+ - jug_dev
extends: .singularity
needs:
- version
- jug_dev
- variables:
- BUILD_IMAGE: "jug_dev"
-jug_xl:singularity:default:
+jug_xl:singularity:
+ parallel:
+ matrix:
+ - BUILD_TYPE:
+ - default
+ - nightly
+ BUILD_IMAGE:
+ - jug_xl
extends: .singularity
needs:
- version
- - jug_xl:default
- variables:
- BUILD_IMAGE: "jug_xl"
+ - jug_xl
-jug_xl:singularity:nightly:
- extends: .singularity
- rules:
- - !reference ['.singularity', rules]
- - if: '$CI_COMMIT_BRANCH == "master"'
- when: on_success
- - when: never
- needs:
- - version
- - 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:
stage: benchmarks
--
GitLab