Add tests on macosx 1015 and 11

Add tests for  macosx 10.15 and 11 on our new runners.
Retire old test on macosx 10.13.

Define number of CPUs in runner configuration.

Move the definition from the global gitlab CI configuration to the local
runner configurations.
Defining the number of CPUs in the runner configuration allows to adjust this
value to the actual underlying hardware.

.gitlab-ci.yml

@@ -190,7 +190,6 @@ FileEndCheck:
 
 .singularity_debian10_variables_jun19: &singularity_debian10_variables_jun19
     OS: debian10
-    NCPU: 14
     FAIRSOFT_VERSION: jun19p2
     FAIRROOT_VERSION: v18.2.1
     BASE_PATH: "/cvmfs/fairsoft.gsi.de/$OS"
@@ -199,7 +198,6 @@ FileEndCheck:
 
 .singularity_debian8_variables_jun19: &singularity_debian8_variables_jun19
     OS: debian8
-    NCPU: 14
     FAIRSOFT_VERSION: jun19p2
     FAIRROOT_VERSION: v18.2.1
     BASE_PATH: "/cvmfs/fairsoft.gsi.de/$OS"
@@ -209,7 +207,6 @@ FileEndCheck:
 
 .singularity_debian8_variables_nov20: &singularity_debian8_variables_nov20
     OS: debian8
-    NCPU: 14
     FAIRSOFT_VERSION: nov20
     FAIRROOT_VERSION: v18.4.2
     BASE_PATH: "/cvmfs/fairsoft.gsi.de/$OS"
@@ -219,7 +216,6 @@ FileEndCheck:
 
 .singularity_debian8_variables_apr21: &singularity_debian8_variables_apr21
     OS: debian8
-    NCPU: 14
     FAIRSOFT_VERSION: apr21
     FAIRROOT_VERSION: v18.6.3
     BASE_PATH: "/cvmfs/fairsoft.gsi.de/$OS"
@@ -256,6 +252,32 @@ FileEndCheck:
     SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
     FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_fairsoft-${FAIRSOFT_VERSION}"
 
+.macosx_1015_tag: &macosx_1015_tag
+  stage: build
+  tags:
+    - CbmRoot_macosx_1015
+
+.macosx_1015_variables: &macosx_1015_variables
+    OS: "macOS_10.15"
+    FAIRSOFT_VERSION: "jun19p1"
+    FAIRROOT_VERSION: "v18.2.1"
+    BASE_PATH: "/opt"
+    SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
+    FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_fairsoft-${FAIRSOFT_VERSION}"
+
+.macosx_11_tag: &macosx_11_tag
+  stage: build
+  tags:
+    - CbmRoot_macosx_11
+
+.macosx_11_variables: &macosx_11_variables
+    OS: "macOS_11"
+    FAIRSOFT_VERSION: "jun19p1"
+    FAIRROOT_VERSION: "v18.2.1"
+    BASE_PATH: "/opt"
+    SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
+    FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_fairsoft-${FAIRSOFT_VERSION}"
+
 .mergeVariables: &mergeVariables
     BUILD_TYPE: "Continuous"
 
@@ -299,20 +321,30 @@ CbmRoot_Merge_Singularity_debian8_nov20:
   variables:
     <<: [*mergeRequestVariables, *singularity_debian8_variables_nov20]
 
-#CbmRoot_Merge_Singularity_debian8_apr21:
-#  <<: [*singularity_tag, *check_merge_request, *build_and_test]
-#  variables:
-#    <<: [*mergeRequestVariables, *singularity_debian8_variables_apr21]
+##CbmRoot_Merge_Singularity_debian8_apr21:
+##  <<: [*singularity_tag, *check_merge_request, *build_and_test]
+##  variables:
+##    <<: [*mergeRequestVariables, *singularity_debian8_variables_apr21]
 
 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]
+#CbmRoot_Merge_macosx:
+#  <<: [*macosx_tag, *check_merge_request, *build_and_test]
+#  variables:
+#    <<: [*mergeRequestVariables, *macosx_variables]
+
+CbmRoot_Merge_macosx_1015:
+  <<: [*macosx_1015_tag, *check_merge_request, *build_and_test]
+  variables:
+    <<: [*mergeRequestVariables, *macosx_1015_variables]
+
+CbmRoot_Merge_macosx_11:
+  <<: [*macosx_11_tag, *check_merge_request, *build_and_test]
   variables:
-    <<: [*mergeRequestVariables, *macosx_variables]
+    <<: [*mergeRequestVariables, *macosx_11_variables]
 
 CbmRoot_Continuous:
   <<: [*linux_tag, *check_merge, *build_and_test]