diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b7c1bf03239aa3a6d05e8754c46d42011b03d7f2..e085c2e018a98bc3234fd87f5346d1733a328161 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -270,28 +270,6 @@ FileLicenceCheck: tags: - CbmRoot_apptainer -.apptainer_debian10_variables_apr21: &apptainer_debian10_variables_apr21 - OS: debian10 - FAIRSOFT_VERSION: apr21p2 - FAIRROOT_VERSION: v18.6.7 - BASE_PATH: "/cvmfs/fairsoft.gsi.de/$OS" - 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.sh" - INSTALL_PROJECT: "TRUE" - EXTRA_FLAGS: '"-DCBM_TEST_INSTALL=TRUE"' - -.apptainer_debian10_variables_nov22p1: &apptainer_debian10_variables_nov22p1 - OS: debian10 - FAIRSOFT_VERSION: nov22p1 - FAIRROOT_VERSION: v18.8.0 - BASE_PATH: "/cvmfs/fairsoft.gsi.de/$OS/" - 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.sh" - INSTALL_PROJECT: "TRUE" - EXTRA_FLAGS: '"-DCBM_TEST_INSTALL=TRUE"' - .apptainer_centos7_variables_apr21: &apptainer_centos7_variables_apr21 OS: centos7 FAIRSOFT_VERSION: apr21p2 @@ -320,6 +298,8 @@ FileLicenceCheck: SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION" FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_fs_${FAIRSOFT_VERSION}" CONFIGFILE: "/cvmfs/cbm.gsi.de/debian10/bin/setup_development_environment.sh" + INSTALL_PROJECT: "TRUE" + EXTRA_FLAGS: '"-DCBM_TEST_INSTALL=TRUE"' .apptainer_vae23_variables_nov22p1: &apptainer_vae23_variables_nov22p1 CONTAINER: "/cvmfs/vae.gsi.de/vae23/containers/user_container-develop.sif" @@ -331,6 +311,8 @@ FileLicenceCheck: SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION" FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_fs_${FAIRSOFT_VERSION}" CONFIGFILE: "/cvmfs/cbm.gsi.de/debian10/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.sif" @@ -351,6 +333,8 @@ FileLicenceCheck: BASE_PATH: "/opt" SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION" FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}" + INSTALL_PROJECT: "TRUE" + EXTRA_FLAGS: '"-DCBM_TEST_INSTALL=TRUE"' .linux_tag: &linux_tag stage: build @@ -466,16 +450,6 @@ CbmRoot_Merge_Apptainer_debian12_nov22p1: variables: <<: [*mergeRequestVariables, *apptainer_debian12_variables_nov22p1] -CbmRoot_Merge_Apptainer_debian10_apr21: - <<: [*apptainer_tag, *check_merge_request, *build_and_test] - variables: - <<: [*mergeRequestVariables, *apptainer_debian10_variables_apr21] - -CbmRoot_Merge_Apptainer_debian10_nov22p1: - <<: [*apptainer_tag, *check_merge_request, *build_and_test] - variables: - <<: [*mergeRequestVariables, *apptainer_debian10_variables_nov22p1] - CbmRoot_Merge_Apptainer_debian11_apr21: <<: [*apptainer_tag, *check_merge_request, *build_and_test] variables: