From b7a89653ac4f643d98ba455c901c29b18323f248 Mon Sep 17 00:00:00 2001
From: P-A Loizeau <p.-a.loizeau@gsi.de>
Date: Tue, 18 Feb 2025 11:30:37 +0100
Subject: [PATCH 1/2] [CI] Remove the CentOs tests as vae23 and 24 stable +
frequent failure
Rational:
- was introduced because bare-metal OS on virgo and virgo2 is centOS + debian containers were not immediately available stable
- now both vae23 (debian10) and vae24 (debian11) are available and well established/used by CBM virgo users
- these two jobs were responsible for ~50% of all pipeline failures due to something hanging up in the load_libraries test at a cost of 2 x 900 s
---
.gitlab-ci.yml | 28 ----------------------------
1 file changed, 28 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 29acd4b0d0..fda792b21f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -269,24 +269,6 @@ FileLicenceCheck:
tags:
- CbmRoot_apptainer
-.apptainer_centos7_variables_apr21: &apptainer_centos7_variables_apr21
- OS: centos7
- FAIRSOFT_VERSION: apr21p2
- FAIRROOT_VERSION: v18.6.7
- BASE_PATH: "/cvmfs/fairsoft.gsi.de/$OS/gcc8"
- SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
- FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_fs_${FAIRSOFT_VERSION}"
- CONFIGFILE: "/cvmfs/cbm.gsi.de/$OS/bin/setup_development_environment_test.sh"
-
-.apptainer_centos7_variables_nov22p1: &apptainer_centos7_variables_nov22p1
- OS: centos7
- FAIRSOFT_VERSION: nov22p1
- FAIRROOT_VERSION: v18.8.0
- BASE_PATH: "/cvmfs/fairsoft.gsi.de/$OS/gcc8"
- SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
- FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}"
- CONFIGFILE: "/cvmfs/fairsoft.gsi.de/$OS/bin/setup_development_environment.sh"
-
.apptainer_vae23_variables_apr21: &apptainer_vae23_variables_apr21
CONTAINER: "/cvmfs/vae.gsi.de/vae23/containers/user_container-production.sif"
OS: vae23
@@ -455,16 +437,6 @@ CbmRoot_Merge_Apptainer_debian11_apr21:
variables:
<<: [*mergeRequestVariables, *apptainer_debian11_variables_apr21]
-CbmRoot_Merge_Apptainer_centos7_apr21:
- <<: [*apptainer_tag, *check_merge_request, *build_and_test]
- variables:
- <<: [*mergeRequestVariables, *apptainer_centos7_variables_apr21]
-
-CbmRoot_Merge_Apptainer_centos7_nov22p1:
- <<: [*apptainer_tag, *check_merge_request, *build_and_test]
- variables:
- <<: [*mergeRequestVariables, *apptainer_centos7_variables_nov22p1]
-
CbmRoot_Merge_Apptainer_vae23_apr21:
<<: [*apptainer_tag, *check_merge_request, *build_and_test]
variables:
--
GitLab
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 2/2] [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 fda792b21f..e5ed3d1aca 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