From a7096196d5b6da94d0e5863cd23275c5b6c8dd13 Mon Sep 17 00:00:00 2001
From: Florian Uhlig <f.uhlig@gsi.de>
Date: Thu, 27 Apr 2023 14:24:44 +0200
Subject: [PATCH] Add test for Debian12 using Apptainer
Use the Apptainer (successor of Singularity) runner to test CbmRoot on a
Debian12 container. Debian12 (bookworm) will be released mid of June.
So the MR adds a test for Debian12 as well as a new container runtime
environment.
---
.gitlab-ci.yml | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4ec91ec3b0..04b9592451 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -205,6 +205,7 @@ FileLicenceCheck:
SIMPATH: "$BASE_PATH/fairsoft_$FAIRSOFT_VERSION/installation"
FAIRROOTPATH: "$BASE_PATH/fairroot_${FAIRROOT_VERSION}-fairsoft_${FAIRSOFT_VERSION}"
+
.singularity_tag: &singularity_tag
stage: build
tags:
@@ -261,6 +262,20 @@ FileLicenceCheck:
INSTALL_PROJECT: "TRUE"
EXTRA_FLAGS: '"-DCBM_TEST_INSTALL=TRUE"'
+.apptainer_tag: &apptainer_tag
+ stage: build
+ tags:
+ - CbmRoot_apptainer
+
+.apptainer_debian12_variables_nov22p1: &apptainer_debian12_variables_nov22p1
+ CONTAINER: "/cvmfs/cbm.gsi.de/containers/debian12_v18.8.0_nov22p1.sif"
+ OS: debian12
+ FAIRSOFT_VERSION: nov22p1
+ FAIRROOT_VERSION: v18.8.0
+ BASE_PATH: "/opt"
+ SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
+ FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}"
+
.linux_tag: &linux_tag
stage: build
tags:
@@ -370,6 +385,11 @@ CbmRoot_Merge_realData:
variables:
<<: [*mergeRequestVariables, *realData_variables]
+CbmRoot_Merge_Apptainer_debian12_nov22p1:
+ <<: [*apptainer_tag, *check_merge_request, *build_and_test]
+ variables:
+ <<: [*mergeRequestVariables, *apptainer_debian12_variables_nov22p1]
+
CbmRoot_Merge_Singularity_debian10_apr21:
<<: [*singularity_tag, *check_merge_request, *build_and_test]
variables:
--
GitLab