diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 910ca3aeffa8734615d6e74d2452e5afdf1deeac..ab7e642e1f0a311f2abb47bb71dc6b9f7178ddae 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,8 +11,8 @@ LCG: - export NPROC=8 - ./install.sh - source tools/setup.sh - - ctest --test-dir build/Darwin --output-junit Testing/Temporary/test_report.xml -j$(nproc) - - ctest --test-dir build/Core --output-junit Testing/Temporary/test_report.xml -j$(nproc) + - ctest --test-dir build/Darwin --output-junit Testing/Temporary/test_report.xml -j$NPROC + - ctest --test-dir build/Core --output-junit Testing/Temporary/test_report.xml -j$NPROC - echo yes | ./uninstall.sh artifacts: when: always diff --git a/CMS/scripts/das-cmssw b/CMS/scripts/das-cmssw index 2aca6af8c25e73dbfd4bfe5320571ec993bef237..402511ea5ae0390c8dd86f759adddf880ff6e317 100755 --- a/CMS/scripts/das-cmssw +++ b/CMS/scripts/das-cmssw @@ -15,6 +15,9 @@ case "$img" in *el8) export CMSSW_VERSION=CMSSW_12_4_0 ;; + *el9) + export CMSSW_VERSION=CMSSW_13_3_0 + ;; *) tput setaf 1 echo "Unknown Linux version. Abort." diff --git a/CMS/scripts/el8 b/CMS/scripts/el8 index 063fb45306f8935e1d523cb944876f864c5a10ed..0edfb3224f98174a5c020b57081aa9e044091b30 100755 --- a/CMS/scripts/el8 +++ b/CMS/scripts/el8 @@ -1,7 +1,7 @@ #!/usr/bin/env bash # inspired from https://gitlab.cern.ch/cms-cat/cmssw-lxplus -export APPTAINER_BINDPATH=/afs,/cvmfs,/cvmfs/grid.cern.ch/etc/grid-security:/etc/grid-security,/cvmfs/grid.cern.ch/etc/grid-security/vomses:/etc/vomses,/etc/pki/ca-trust,/run/user,/tmp,/var/run/user,/etc/sysconfig,/etc:/orig/etc,$DAS_BASE +export APPTAINER_BINDPATH=/afs,/cvmfs,/cvmfs/grid.cern.ch/etc/grid-security:/etc/grid-security,/cvmfs/grid.cern.ch/etc/grid-security/vomses:/etc/vomses,/etc/pki/ca-trust,/run/user,/tmp,/var/run/user,/etc/sysconfig,/etc:/orig/etc,$DAS_BASE,$DARWIN_TABLES # note: apptainer will gently fail if any of the paths cannot be found # cluster-dependent paths @@ -21,6 +21,9 @@ case "$0" in *el8) export img=/cvmfs/unpacked.cern.ch/registry.hub.docker.com/cmssw/el8:x86_64 ;; + *el9) + export img=/cvmfs/unpacked.cern.ch/registry.hub.docker.com/cmssw/el9:x86_64 + ;; *) tput setaf 1 echo "Unknown Linux version. Abort." diff --git a/CMakeLists.txt b/CMakeLists.txt index 23fcbc040715d990cb702b24b11154d6cabcbca7..1dba4999dcf858700930269e54a41239cfa9138d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -127,3 +127,4 @@ set(PREFIX_COMMANDS CMS/scripts/el8 CMS/scripts/das-cmssw) # TODO: apply convent file(COPY ${PREFIX_COMMANDS} DESTINATION "${CMAKE_BINARY_DIR}/bin") install(PROGRAMS ${PREFIX_COMMANDS} TYPE BIN COMPONENT ${CMAKE_PROJECT_NAME}) INSTALL(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/el8\" \"\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/cc7\")") +INSTALL(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/el8\" \"\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/el9\")") diff --git a/install.sh b/install.sh index 89c418aa07438f3d6577a27fb23fa1f32cbb9158..ac8079ca410711159f3617b6b818c51a56d04110 100755 --- a/install.sh +++ b/install.sh @@ -50,5 +50,6 @@ fi # install CMSSW in a container # - 1st arg: CMSSW version # - 2nd arg: corresponding jet toolbox branch -el8 CMS/install_CMSSW.sh CMSSW_12_4_0 jetToolbox_120X # cc7 CMS/install_CMSSW.sh CMSSW_10_6_30 jetToolbox_102X +el8 CMS/install_CMSSW.sh CMSSW_12_4_0 jetToolbox_120X +el9 CMS/install_CMSSW.sh CMSSW_13_3_0 jetToolbox_120X