From 664f0d19159e1aa2af85a86cd2c608604b65ded0 Mon Sep 17 00:00:00 2001
From: Marco Clemencic <marco.clemencic@cern.ch>
Date: Thu, 20 Feb 2025 15:13:22 +0000
Subject: [PATCH 1/3] replace GaussinoExtLibs with DD4hepDDG4 in lcg devX slots
---
lhcbnightlyconf/Main.py | 3 +++
lhcbnightlyconf/lcg_nightlies.py | 15 ++++++++-------
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/lhcbnightlyconf/Main.py b/lhcbnightlyconf/Main.py
index ae616b0e..576f26be 100644
--- a/lhcbnightlyconf/Main.py
+++ b/lhcbnightlyconf/Main.py
@@ -71,6 +71,9 @@ def create_head_slot(name,
if hasattr(slot, 'GaussinoExtLibs'):
slot.GaussinoExtLibs.checkout_opts['url'] = (
'https://gitlab.cern.ch/Gaussino/gaussinoextlibs.git')
+ if hasattr(slot, 'DD4hepDDG4'):
+ slot.DD4hepDDG4.checkout_opts['url'] = (
+ 'https://gitlab.cern.ch/Gaussino/DD4hepDDG4.git')
for pname in PROJECTS_WITHOUT_TESTS:
if hasattr(slot, pname):
getattr(slot, pname).no_test = True
diff --git a/lhcbnightlyconf/lcg_nightlies.py b/lhcbnightlyconf/lcg_nightlies.py
index d7de3446..5aabb27a 100644
--- a/lhcbnightlyconf/lcg_nightlies.py
+++ b/lhcbnightlyconf/lcg_nightlies.py
@@ -15,7 +15,7 @@ import re
from lb.nightly.configuration import Project, slot_factory
-from .Common import (DEFAULT_CACHE_ENTRIES, DEFAULT_REQUIRED_EXTERNALS,
+from .Common import (ALL_PROJECTS, DEFAULT_CACHE_ENTRIES, DEFAULT_REQUIRED_EXTERNALS,
PLATFORMS_RUN2, LCGToolchains)
from .Main import create_head_slot
from .Patches import preparePatchesSlot
@@ -63,11 +63,13 @@ PLATFORMS = [
"armv8.1_a-el9-gcc13-dbg",
]
+PROJECTS = [name for name in ALL_PROJECTS if name != "GaussinoExtLibs"] + ["DD4hepDDG4"]
def create_lcg_slot(lcg_version):
slot = create_head_slot(
'lhcb-gaudi-head',
LCG="{0}/{1}".format(lcg_version, TODAY),
+ projects=PROJECTS,
platforms=PLATFORMS)
slot.name = 'lhcb-lcg-' + lcg_version
slot.env = [
@@ -98,12 +100,11 @@ lcg = {
'dev4': create_lcg_slot(lcg_version='dev4lhcb'),
}
-lcg['dev3'].projects.append(Project("GitCondDB", "HEAD"))
-lcg['dev3'].Detector._deps = ["GitCondDB"]
-lcg['dev3'].enabled = (TODAY == 'Sat')
-lcg['dev4'].projects.append(Project("GitCondDB", "HEAD"))
-lcg['dev4'].Detector._deps = ["GitCondDB"]
-lcg['dev4'].enabled = (TODAY == 'Sat')
+for dev in lcg.values():
+ dev.projects.append(Project("GitCondDB", "HEAD"))
+ dev.Detector._deps = ["GitCondDB"]
+
+ dev.enabled = (TODAY == 'Sat')
# dev3lhcb contains HepMC3 instead of HepMC
if "HepMC" in lcg["dev3"].preconditions[0]["args"]["required"]:
--
GitLab
From cc23c506095b79bb09fe59e99cb72a3bfd353245 Mon Sep 17 00:00:00 2001
From: Marco Clemencic <marco.clemencic@cern.ch>
Date: Fri, 21 Feb 2025 08:35:26 +0000
Subject: [PATCH 2/3] fix formatting
---
lhcbnightlyconf/lcg_nightlies.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/lhcbnightlyconf/lcg_nightlies.py b/lhcbnightlyconf/lcg_nightlies.py
index 5aabb27a..b5225748 100644
--- a/lhcbnightlyconf/lcg_nightlies.py
+++ b/lhcbnightlyconf/lcg_nightlies.py
@@ -15,8 +15,8 @@ import re
from lb.nightly.configuration import Project, slot_factory
-from .Common import (ALL_PROJECTS, DEFAULT_CACHE_ENTRIES, DEFAULT_REQUIRED_EXTERNALS,
- PLATFORMS_RUN2, LCGToolchains)
+from .Common import (ALL_PROJECTS, DEFAULT_CACHE_ENTRIES,
+ DEFAULT_REQUIRED_EXTERNALS, PLATFORMS_RUN2, LCGToolchains)
from .Main import create_head_slot
from .Patches import preparePatchesSlot
@@ -63,7 +63,8 @@ PLATFORMS = [
"armv8.1_a-el9-gcc13-dbg",
]
-PROJECTS = [name for name in ALL_PROJECTS if name != "GaussinoExtLibs"] + ["DD4hepDDG4"]
+PROJECTS = [name for name in ALL_PROJECTS if name != "GaussinoExtLibs"
+ ] + ["DD4hepDDG4"]
def create_lcg_slot(lcg_version):
slot = create_head_slot(
--
GitLab
From 2187cb4c9da5f340e79128937214e603281a035c Mon Sep 17 00:00:00 2001
From: Marco Clemencic <marco.clemencic@cern.ch>
Date: Fri, 21 Feb 2025 08:38:38 +0000
Subject: [PATCH 3/3] formatting fix
---
lhcbnightlyconf/lcg_nightlies.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/lhcbnightlyconf/lcg_nightlies.py b/lhcbnightlyconf/lcg_nightlies.py
index b5225748..62e743fc 100644
--- a/lhcbnightlyconf/lcg_nightlies.py
+++ b/lhcbnightlyconf/lcg_nightlies.py
@@ -66,6 +66,7 @@ PLATFORMS = [
PROJECTS = [name for name in ALL_PROJECTS if name != "GaussinoExtLibs"
] + ["DD4hepDDG4"]
+
def create_lcg_slot(lcg_version):
slot = create_head_slot(
'lhcb-gaudi-head',
--
GitLab