From 89c1751b3b9e34f69b3e913f4ad91a2cf56f0ebe Mon Sep 17 00:00:00 2001
From: Marco Clemencic <marco.clemencic@cern.ch>
Date: Wed, 12 Mar 2025 14:35:30 +0100
Subject: [PATCH 1/3] Use default Gaudi version in lhcb-run5
---
lhcbnightlyconf/Run5.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/lhcbnightlyconf/Run5.py b/lhcbnightlyconf/Run5.py
index eff1a428..ac4d2d7b 100644
--- a/lhcbnightlyconf/Run5.py
+++ b/lhcbnightlyconf/Run5.py
@@ -13,7 +13,8 @@ from lb.nightly.configuration import Project, Slot
from .Common import (DEFAULT_CACHE_ENTRIES, DEFAULT_ENV, ERROR_EXCEPTIONS,
WARNINGS_EXCEPTIONS)
-from .Main import LCG_DEFAULT_VERSION
+from .Main import (DEFAULT_GAUDI_RELEASED, DEFAULT_GAUDI_VERSION,
+ LCG_DEFAULT_VERSION)
run5 = Slot(
"lhcb-run5",
@@ -21,7 +22,7 @@ run5 = Slot(
projects=[
Project(name, version) for name, version in [
("LCG", LCG_DEFAULT_VERSION),
- ("Gaudi", "v39r2"),
+ ("Gaudi", DEFAULT_GAUDI_VERSION),
("Detector", "master"),
("LHCb", "run5"),
("Lbcom", "master"),
@@ -41,5 +42,6 @@ run5 = Slot(
)
run5.LCG.disabled = True
run5.Lbcom.no_test = True
+run5.Gaudi.disabled = DEFAULT_GAUDI_RELEASED
slots = [run5]
--
GitLab
From 4b15613b14a7d1dad8c8d13b1d1261c35d2e77ea Mon Sep 17 00:00:00 2001
From: Marco Clemencic <marco.clemencic@cern.ch>
Date: Thu, 13 Mar 2025 09:02:25 +0100
Subject: [PATCH 2/3] Update LCG default version to 106c
---
lhcbnightlyconf/Main.py | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/lhcbnightlyconf/Main.py b/lhcbnightlyconf/Main.py
index 7b0b6fa1..71bf3338 100644
--- a/lhcbnightlyconf/Main.py
+++ b/lhcbnightlyconf/Main.py
@@ -24,7 +24,7 @@ from .Common import ( # isort: skip
DEFAULT_GAUDI_RELEASED, DEFAULT_GAUDI_VERSION, ERROR_EXCEPTIONS,
WARNINGS_EXCEPTIONS, LCGToolchains, MASTER_PLATFORMS)
-LCG_DEFAULT_VERSION = '105c'
+LCG_DEFAULT_VERSION = '106c'
PROJECTS_WITHOUT_TESTS = ['Lbcom', 'Panoramix', 'Geant4']
HEAD_PLATFORMS = {
@@ -109,8 +109,7 @@ gaudi_head = create_head_slot('lhcb-gaudi-head')
gaudi_head.cache_entries["GAUDI_TEST_PUBLIC_HEADERS_BUILD"] = True
slots.append(gaudi_head)
-head = create_head_slot('lhcb-head', LCG="106c")
-head.cache_entries["LCG_LAYER"] = "LHCB_8"
+head = create_head_slot('lhcb-head')
head.Gaudi.version = DEFAULT_GAUDI_VERSION
head.Gaudi.disabled = DEFAULT_GAUDI_RELEASED
head.desc = head.desc.replace(
--
GitLab
From 19cd09d7e8219bfdbbb0e6d49800e769e2b61fd0 Mon Sep 17 00:00:00 2001
From: Marco Clemencic <marco.clemencic@cern.ch>
Date: Thu, 13 Mar 2025 11:19:41 +0100
Subject: [PATCH 3/3] Fix LHCb project branch for LCG 105c compatibility in
sim11
Switch LHCb from HEAD to lcg-105-compat branch in lhcb-sim11 to ensure it works with LCG 105c dependencies.
---
lhcbnightlyconf/Gauss.py | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/lhcbnightlyconf/Gauss.py b/lhcbnightlyconf/Gauss.py
index e6544d34..72218f65 100644
--- a/lhcbnightlyconf/Gauss.py
+++ b/lhcbnightlyconf/Gauss.py
@@ -154,15 +154,14 @@ def create_gaussino_slot(name, desc, platforms=SIM11_PLATFORMS):
Project('Gaudi', 'v39r2'),
Project('Geant4', 'HEAD'),
Project('Detector', 'HEAD'),
- Project('LHCb', 'HEAD'),
# LHCb/master is not compatible with LCG 105c
- # Project(
- # 'LHCb',
- # 'lcg-105-compat-patches',
- # checkout=('git', {
- # 'merges': 'all'
- # }),
- #),
+ Project(
+ 'LHCb',
+ 'lcg-105-compat',
+ checkout=('git', {
+ 'merges': 'all'
+ }),
+ ),
Project('Run2Support', 'HEAD'),
Project(
'GaussinoExtLibs',
--
GitLab