Reenable lxir116 for CI

Machine is now running with Debian10.
Only set the proper CVMFS paths,

.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]