From 1e70cb3f7bdf785158c5742ef93ab193f051d672 Mon Sep 17 00:00:00 2001
From: Florian Uhlig <f.uhlig@gsi.de>
Date: Tue, 1 Feb 2022 16:51:23 +0100
Subject: [PATCH] Reenable lxir116 for CI
Machine is now running with Debian10.
Only set the proper CVMFS paths,
---
.gitlab-ci.yml | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 56424babae..8feed66bab 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -278,14 +278,13 @@ FileLicenceCheck:
- CbmRoot
.linux_variables: &linux_variables
- OS: "Debian8.11"
- EXTRA_PATH: /cvmfs/it.gsi.de/cmake/3.19.1/bin
+ OS: "Debian10.11"
NCPU: 5
- FAIRSOFT_VERSION: "jun19p1"
- FAIRROOT_VERSION: "v18.2.0"
- BASE_PATH: "/cvmfs/fairroot.gsi.de"
+ FAIRSOFT_VERSION: "jun19p2"
+ FAIRROOT_VERSION: "v18.2.1"
+ BASE_PATH: "/cvmfs/fairsoft.gsi.de/debian10"
SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
- FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_fairsoft-${FAIRSOFT_VERSION}"
+ FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_fs_${FAIRSOFT_VERSION}"
.macosx_tag: &macosx_tag
stage: build
@@ -404,10 +403,10 @@ CbmRoot_Merge_Singularity_centos7_apr21:
variables:
<<: [*mergeRequestVariables, *singularity_centos7_variables_apr21]
-#CbmRoot_Merge:
-# <<: [*linux_tag, *check_merge_request, *build_and_test]
-# variables:
-# <<: [*mergeRequestVariables, *linux_variables]
+CbmRoot_Merge:
+ <<: [*linux_tag, *check_merge_request, *build_and_test]
+ variables:
+ <<: [*mergeRequestVariables, *linux_variables]
#CbmRoot_Merge_macosx:
# <<: [*macosx_tag, *check_merge_request, *build_and_test]
--
GitLab