diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 23e2f6a83f74da0fd541bed99b8161b7fb5e989f..772f3ec7b01b15efd4963f3d287d9359610edaa2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -186,7 +186,7 @@ FileEndCheck: tags: - CbmRoot_singularity -.singularity_debian10_variables: &singularity_debian10_variables +.singularity_debian10_variables_jun19: &singularity_debian10_variables_jun19 OS: debian10 NCPU: 14 FAIRSOFT_VERSION: jun19p2 @@ -282,10 +282,10 @@ CbmRoot_Merge_realData: variables: <<: [*mergeRequestVariables, *realData_variables] -CbmRoot_Merge_Singularity_debian10: +CbmRoot_Merge_Singularity_debian10_jun19: <<: [*singularity_tag, *check_merge_request, *build_and_test] variables: - <<: [*mergeRequestVariables, *singularity_debian10_variables] + <<: [*mergeRequestVariables, *singularity_debian10_variables_jun19] CbmRoot_Merge_Singularity_debian8_jun19: <<: [*singularity_tag, *check_merge_request, *build_and_test] @@ -297,10 +297,10 @@ 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]