From 0eed2bc8299773f802151c1c95dd0131e2a826fd Mon Sep 17 00:00:00 2001
From: "Patrick L.S. Connor" <patrick.connor@cern.ch>
Date: Fri, 31 Jan 2025 13:56:27 +0100
Subject: [PATCH 1/2] limiting number of logical cores in LCG CI
---
.gitlab-ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 910ca3a..ab7e642 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
--
GitLab
From c185793a6f5413080addf66a16f2c6515b227011 Mon Sep 17 00:00:00 2001
From: "Patrick L.S. Connor" <patrick.connor@cern.ch>
Date: Fri, 31 Jan 2025 11:11:01 +0100
Subject: [PATCH 2/2] enabling installation of CMSSW 13 for Run 3 analysis
---
CMS/scripts/das-cmssw | 3 +++
CMS/scripts/el8 | 5 ++++-
CMakeLists.txt | 1 +
install.sh | 3 ++-
4 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/CMS/scripts/das-cmssw b/CMS/scripts/das-cmssw
index 2aca6af..402511e 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 063fb45..0edfb32 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 23fcbc0..1dba499 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 89c418a..ac8079c 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
--
GitLab