From d99f618e9fcddbde946c42e1060c551a4dfbaefb Mon Sep 17 00:00:00 2001
From: P-A Loizeau <p.-a.loizeau@gsi.de>
Date: Tue, 18 Feb 2025 11:42:30 +0100
Subject: [PATCH] [CI] Add jobs for vae24 pro + new dev fs+fr pair introduced
in 06f22bc0 (jan24pX + 18.8.2)
---
.gitlab-ci.yml | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fda792b21..e5ed3d1ac 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -293,6 +293,30 @@ FileLicenceCheck:
INSTALL_PROJECT: "TRUE"
EXTRA_FLAGS: '"-DCBM_TEST_INSTALL=TRUE"'
+.apptainer_vae24_variables_nov22p3: &apptainer_vae24_variables_nov22p3
+ CONTAINER: "/cvmfs/vae.gsi.de/vae24/containers/user_container-production.sif"
+ OS: vae24
+ FAIRSOFT_VERSION: nov22p3
+ FAIRROOT_VERSION: v18.8.0
+ BASE_PATH: "/cvmfs/fairsoft.gsi.de/debian11/"
+ SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
+ FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}"
+ CONFIGFILE: "/cvmfs/cbm.gsi.de/debian11/bin/setup_development_environment.sh"
+ INSTALL_PROJECT: "TRUE"
+ EXTRA_FLAGS: '"-DCBM_TEST_INSTALL=TRUE"'
+
+.apptainer_vae24_variables_jan24p1: &apptainer_vae24_variables_jan24p1
+ CONTAINER: "/cvmfs/vae.gsi.de/vae24/containers/user_container-production.sif"
+ OS: vae24
+ FAIRSOFT_VERSION: jan24p1
+ FAIRROOT_VERSION: v18.8.2
+ BASE_PATH: "/cvmfs/fairsoft.gsi.de/debian11/"
+ SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
+ FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}"
+ CONFIGFILE: "/cvmfs/cbm.gsi.de/debian11/bin/setup_development_environment.sh"
+ INSTALL_PROJECT: "TRUE"
+ EXTRA_FLAGS: '"-DCBM_TEST_INSTALL=TRUE"'
+
.apptainer_debian11_variables_apr21: &apptainer_debian11_variables_apr21
CONTAINER: "/cvmfs/cbm.gsi.de/containers/debian11_v18.6.7_apr21p2_1.sif"
OS: debian11
@@ -447,6 +471,16 @@ CbmRoot_Merge_Apptainer_vae23_nov22p1:
variables:
<<: [*mergeRequestVariables, *apptainer_vae23_variables_nov22p1]
+CbmRoot_Merge_Apptainer_vae24_nov22p3:
+ <<: [*apptainer_tag, *check_merge_request, *build_and_test]
+ variables:
+ <<: [*mergeRequestVariables, *apptainer_vae24_variables_nov22p3]
+
+CbmRoot_Merge_Apptainer_vae24_jan24p1:
+ <<: [*apptainer_tag, *check_merge_request, *build_and_test]
+ variables:
+ <<: [*mergeRequestVariables, *apptainer_vae24_variables_jan24p1]
+
CbmRoot_Merge_macosx_13_nov22p1:
<<: [*macosx_tag, *check_merge_request, *build_and_test]
variables:
--
GitLab