From eedaa29a098a8008a4602e8b060f1826a40e3fdc Mon Sep 17 00:00:00 2001
From: Florian Uhlig <f.uhlig@gsi.de>
Date: Thu, 18 Jan 2024 13:42:01 +0100
Subject: [PATCH] Remove obsolete CI test systems
The Debian10 container is superseded by the container vae23. Remove the old
container from the test matrix and use onlx the new one.
---
.gitlab-ci.yml | 38 ++++++--------------------------------
1 file changed, 6 insertions(+), 32 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b7c1bf0323..e085c2e018 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -270,28 +270,6 @@ FileLicenceCheck:
tags:
- CbmRoot_apptainer
-.apptainer_debian10_variables_apr21: &apptainer_debian10_variables_apr21
- OS: debian10
- FAIRSOFT_VERSION: apr21p2
- FAIRROOT_VERSION: v18.6.7
- BASE_PATH: "/cvmfs/fairsoft.gsi.de/$OS"
- 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.sh"
- INSTALL_PROJECT: "TRUE"
- EXTRA_FLAGS: '"-DCBM_TEST_INSTALL=TRUE"'
-
-.apptainer_debian10_variables_nov22p1: &apptainer_debian10_variables_nov22p1
- OS: debian10
- FAIRSOFT_VERSION: nov22p1
- FAIRROOT_VERSION: v18.8.0
- BASE_PATH: "/cvmfs/fairsoft.gsi.de/$OS/"
- 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.sh"
- INSTALL_PROJECT: "TRUE"
- EXTRA_FLAGS: '"-DCBM_TEST_INSTALL=TRUE"'
-
.apptainer_centos7_variables_apr21: &apptainer_centos7_variables_apr21
OS: centos7
FAIRSOFT_VERSION: apr21p2
@@ -320,6 +298,8 @@ FileLicenceCheck:
SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_fs_${FAIRSOFT_VERSION}"
CONFIGFILE: "/cvmfs/cbm.gsi.de/debian10/bin/setup_development_environment.sh"
+ INSTALL_PROJECT: "TRUE"
+ EXTRA_FLAGS: '"-DCBM_TEST_INSTALL=TRUE"'
.apptainer_vae23_variables_nov22p1: &apptainer_vae23_variables_nov22p1
CONTAINER: "/cvmfs/vae.gsi.de/vae23/containers/user_container-develop.sif"
@@ -331,6 +311,8 @@ FileLicenceCheck:
SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_fs_${FAIRSOFT_VERSION}"
CONFIGFILE: "/cvmfs/cbm.gsi.de/debian10/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.sif"
@@ -351,6 +333,8 @@ FileLicenceCheck:
BASE_PATH: "/opt"
SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}"
+ INSTALL_PROJECT: "TRUE"
+ EXTRA_FLAGS: '"-DCBM_TEST_INSTALL=TRUE"'
.linux_tag: &linux_tag
stage: build
@@ -466,16 +450,6 @@ CbmRoot_Merge_Apptainer_debian12_nov22p1:
variables:
<<: [*mergeRequestVariables, *apptainer_debian12_variables_nov22p1]
-CbmRoot_Merge_Apptainer_debian10_apr21:
- <<: [*apptainer_tag, *check_merge_request, *build_and_test]
- variables:
- <<: [*mergeRequestVariables, *apptainer_debian10_variables_apr21]
-
-CbmRoot_Merge_Apptainer_debian10_nov22p1:
- <<: [*apptainer_tag, *check_merge_request, *build_and_test]
- variables:
- <<: [*mergeRequestVariables, *apptainer_debian10_variables_nov22p1]
-
CbmRoot_Merge_Apptainer_debian11_apr21:
<<: [*apptainer_tag, *check_merge_request, *build_and_test]
variables:
--
GitLab