From 0a1e55f8b6e0e70e9c622e64be0fe5255aed6e52 Mon Sep 17 00:00:00 2001
From: Florian Uhlig <f.uhlig@gsi.de>
Date: Wed, 16 Jun 2021 18:01:49 +0200
Subject: [PATCH] Add another image for singularity
Beside the existing debian10 test, now also debian8 is tested.
Limit the number of used CPUs to 14 such that 4 concurrent jobs
don't interfere with each other.
---
.gitlab-ci.yml | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 15c4e7f1ed..855ded2cf9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -190,13 +190,23 @@ FileEndCheck:
.singularity_debian10_variables: &singularity_debian10_variables
OS: debian10
- NCPU: 16
+ NCPU: 14
FAIRSOFT_VERSION: jun19p2
FAIRROOT_VERSION: v18.2.1
BASE_PATH: "/cvmfs/fairsoft.gsi.de/$OS"
SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_fs_${FAIRSOFT_VERSION}"
+.singularity_debian8_variables: &singularity_debian8_variables
+ OS: debian8
+ NCPU: 14
+ FAIRSOFT_VERSION: jun19p2
+ FAIRROOT_VERSION: v18.2.1
+ BASE_PATH: "/cvmfs/fairsoft.gsi.de/$OS"
+ SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
+ FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_fairsoft-${FAIRSOFT_VERSION}"
+ EXTRA_PATH: $SIMPATH/bin
+
.linux_tag: &linux_tag
stage: build
tags:
@@ -254,11 +264,16 @@ CbmRoot_Merge_realData:
variables:
<<: [*mergeRequestVariables, *realData_variables]
-CbmRoot_Merge_Singularity:
+CbmRoot_Merge_Singularity_debian10:
<<: [*singularity_tag, *check_merge_request, *build_and_test]
variables:
<<: [*mergeRequestVariables, *singularity_debian10_variables]
+CbmRoot_Merge_Singularity_debian8:
+ <<: [*singularity_tag, *check_merge_request, *build_and_test]
+ variables:
+ <<: [*mergeRequestVariables, *singularity_debian8_variables]
+
CbmRoot_Merge:
<<: [*linux_tag, *check_merge_request, *build_and_test]
variables:
--
GitLab