Commit 0a1e55f8 authored by Administrator's avatar Administrator Committed by Florian Uhlig
Browse files

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.
parent 8b4d798a
...@@ -190,13 +190,23 @@ FileEndCheck: ...@@ -190,13 +190,23 @@ FileEndCheck:
.singularity_debian10_variables: &singularity_debian10_variables .singularity_debian10_variables: &singularity_debian10_variables
OS: debian10 OS: debian10
NCPU: 16 NCPU: 14
FAIRSOFT_VERSION: jun19p2 FAIRSOFT_VERSION: jun19p2
FAIRROOT_VERSION: v18.2.1 FAIRROOT_VERSION: v18.2.1
BASE_PATH: "/cvmfs/fairsoft.gsi.de/$OS" BASE_PATH: "/cvmfs/fairsoft.gsi.de/$OS"
SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION" SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_fs_${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 .linux_tag: &linux_tag
stage: build stage: build
tags: tags:
...@@ -254,11 +264,16 @@ CbmRoot_Merge_realData: ...@@ -254,11 +264,16 @@ CbmRoot_Merge_realData:
variables: variables:
<<: [*mergeRequestVariables, *realData_variables] <<: [*mergeRequestVariables, *realData_variables]
CbmRoot_Merge_Singularity: CbmRoot_Merge_Singularity_debian10:
<<: [*singularity_tag, *check_merge_request, *build_and_test] <<: [*singularity_tag, *check_merge_request, *build_and_test]
variables: variables:
<<: [*mergeRequestVariables, *singularity_debian10_variables] <<: [*mergeRequestVariables, *singularity_debian10_variables]
CbmRoot_Merge_Singularity_debian8:
<<: [*singularity_tag, *check_merge_request, *build_and_test]
variables:
<<: [*mergeRequestVariables, *singularity_debian8_variables]
CbmRoot_Merge: CbmRoot_Merge:
<<: [*linux_tag, *check_merge_request, *build_and_test] <<: [*linux_tag, *check_merge_request, *build_and_test]
variables: variables:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment