Skip to content
Snippets Groups Projects
Commit 1e70cb3f authored by Administrator's avatar Administrator Committed by Florian Uhlig
Browse files

Reenable lxir116 for CI 

Machine is now running with Debian10.
Only set the proper CVMFS paths,
parent 7775ed1a
No related branches found
No related tags found
1 merge request!682Reenable lxir116 for CI
Pipeline #15639 passed
Stage: build
    Hide whitespace changes
    Inline Side-by-side
    Showing
    with 9 additions and 10 deletions
    .gitlab-ci.yml
    + 9
    − 10
    View file @ 1e70cb3f
    ...@@ -278,14 +278,13 @@ FileLicenceCheck: ...@@ -278,14 +278,13 @@ FileLicenceCheck:
    - CbmRoot - CbmRoot
    .linux_variables: &linux_variables .linux_variables: &linux_variables
    OS: "Debian8.11" OS: "Debian10.11"
    EXTRA_PATH: /cvmfs/it.gsi.de/cmake/3.19.1/bin
    NCPU: 5 NCPU: 5
    FAIRSOFT_VERSION: "jun19p1" FAIRSOFT_VERSION: "jun19p2"
    FAIRROOT_VERSION: "v18.2.0" FAIRROOT_VERSION: "v18.2.1"
    BASE_PATH: "/cvmfs/fairroot.gsi.de" BASE_PATH: "/cvmfs/fairsoft.gsi.de/debian10"
    SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION" 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 .macosx_tag: &macosx_tag
    stage: build stage: build
    ...@@ -404,10 +403,10 @@ CbmRoot_Merge_Singularity_centos7_apr21: ...@@ -404,10 +403,10 @@ CbmRoot_Merge_Singularity_centos7_apr21:
    variables: variables:
    <<: [*mergeRequestVariables, *singularity_centos7_variables_apr21] <<: [*mergeRequestVariables, *singularity_centos7_variables_apr21]
    #CbmRoot_Merge: CbmRoot_Merge:
    # <<: [*linux_tag, *check_merge_request, *build_and_test] <<: [*linux_tag, *check_merge_request, *build_and_test]
    # variables: variables:
    # <<: [*mergeRequestVariables, *linux_variables] <<: [*mergeRequestVariables, *linux_variables]
    #CbmRoot_Merge_macosx: #CbmRoot_Merge_macosx:
    # <<: [*macosx_tag, *check_merge_request, *build_and_test] # <<: [*macosx_tag, *check_merge_request, *build_and_test]
    ......
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment