diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 29acd4b0d0ca933511b1977c1ddc4c8cfef82585..e5ed3d1aca6c1cbd00fa78bb4815790b8e40d5cd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -269,24 +269,6 @@ FileLicenceCheck: tags: - CbmRoot_apptainer -.apptainer_centos7_variables_apr21: &apptainer_centos7_variables_apr21 - OS: centos7 - FAIRSOFT_VERSION: apr21p2 - FAIRROOT_VERSION: v18.6.7 - BASE_PATH: "/cvmfs/fairsoft.gsi.de/$OS/gcc8" - SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION" - FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_fs_${FAIRSOFT_VERSION}" - CONFIGFILE: "/cvmfs/cbm.gsi.de/$OS/bin/setup_development_environment_test.sh" - -.apptainer_centos7_variables_nov22p1: &apptainer_centos7_variables_nov22p1 - OS: centos7 - FAIRSOFT_VERSION: nov22p1 - FAIRROOT_VERSION: v18.8.0 - BASE_PATH: "/cvmfs/fairsoft.gsi.de/$OS/gcc8" - SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION" - FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}" - CONFIGFILE: "/cvmfs/fairsoft.gsi.de/$OS/bin/setup_development_environment.sh" - .apptainer_vae23_variables_apr21: &apptainer_vae23_variables_apr21 CONTAINER: "/cvmfs/vae.gsi.de/vae23/containers/user_container-production.sif" OS: vae23 @@ -311,6 +293,30 @@ FileLicenceCheck: INSTALL_PROJECT: "TRUE" EXTRA_FLAGS: '"-DCBM_TEST_INSTALL=TRUE"' +.apptainer_vae24_variables_nov22p3: &apptainer_vae24_variables_nov22p3 + CONTAINER: "/cvmfs/vae.gsi.de/vae24/containers/user_container-production.sif" + OS: vae24 + FAIRSOFT_VERSION: nov22p3 + FAIRROOT_VERSION: v18.8.0 + BASE_PATH: "/cvmfs/fairsoft.gsi.de/debian11/" + SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION" + FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}" + CONFIGFILE: "/cvmfs/cbm.gsi.de/debian11/bin/setup_development_environment.sh" + INSTALL_PROJECT: "TRUE" + EXTRA_FLAGS: '"-DCBM_TEST_INSTALL=TRUE"' + +.apptainer_vae24_variables_jan24p1: &apptainer_vae24_variables_jan24p1 + CONTAINER: "/cvmfs/vae.gsi.de/vae24/containers/user_container-production.sif" + OS: vae24 + FAIRSOFT_VERSION: jan24p1 + FAIRROOT_VERSION: v18.8.2 + BASE_PATH: "/cvmfs/fairsoft.gsi.de/debian11/" + SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION" + FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}" + CONFIGFILE: "/cvmfs/cbm.gsi.de/debian11/bin/setup_development_environment.sh" + INSTALL_PROJECT: "TRUE" + EXTRA_FLAGS: '"-DCBM_TEST_INSTALL=TRUE"' + .apptainer_debian11_variables_apr21: &apptainer_debian11_variables_apr21 CONTAINER: "/cvmfs/cbm.gsi.de/containers/debian11_v18.6.7_apr21p2_1.sif" OS: debian11 @@ -455,25 +461,25 @@ CbmRoot_Merge_Apptainer_debian11_apr21: variables: <<: [*mergeRequestVariables, *apptainer_debian11_variables_apr21] -CbmRoot_Merge_Apptainer_centos7_apr21: +CbmRoot_Merge_Apptainer_vae23_apr21: <<: [*apptainer_tag, *check_merge_request, *build_and_test] variables: - <<: [*mergeRequestVariables, *apptainer_centos7_variables_apr21] + <<: [*mergeRequestVariables, *apptainer_vae23_variables_apr21] -CbmRoot_Merge_Apptainer_centos7_nov22p1: +CbmRoot_Merge_Apptainer_vae23_nov22p1: <<: [*apptainer_tag, *check_merge_request, *build_and_test] variables: - <<: [*mergeRequestVariables, *apptainer_centos7_variables_nov22p1] + <<: [*mergeRequestVariables, *apptainer_vae23_variables_nov22p1] -CbmRoot_Merge_Apptainer_vae23_apr21: +CbmRoot_Merge_Apptainer_vae24_nov22p3: <<: [*apptainer_tag, *check_merge_request, *build_and_test] variables: - <<: [*mergeRequestVariables, *apptainer_vae23_variables_apr21] + <<: [*mergeRequestVariables, *apptainer_vae24_variables_nov22p3] -CbmRoot_Merge_Apptainer_vae23_nov22p1: +CbmRoot_Merge_Apptainer_vae24_jan24p1: <<: [*apptainer_tag, *check_merge_request, *build_and_test] variables: - <<: [*mergeRequestVariables, *apptainer_vae23_variables_nov22p1] + <<: [*mergeRequestVariables, *apptainer_vae24_variables_jan24p1] CbmRoot_Merge_macosx_13_nov22p1: <<: [*macosx_tag, *check_merge_request, *build_and_test]