From 4bba4eda4fd5dfbb5400eda30b8981e82aa6274b Mon Sep 17 00:00:00 2001
From: Gloria Corti <gloria.corti@cern.ch>
Date: Fri, 8 Mar 2024 11:28:34 +0100
Subject: [PATCH 1/2] Move to new stack for sim11 release
---
lhcbnightlyconf/Gauss.py | 17 +++--------------
1 file changed, 3 insertions(+), 14 deletions(-)
diff --git a/lhcbnightlyconf/Gauss.py b/lhcbnightlyconf/Gauss.py
index c8ae1196..7328396f 100644
--- a/lhcbnightlyconf/Gauss.py
+++ b/lhcbnightlyconf/Gauss.py
@@ -111,15 +111,12 @@ SIM11_PLATFORMS = [
]
REL11_PLATFORMS = SIM11_PLATFORMS + [
- 'x86_64_v2-centos7-gcc12-opt', 'x86_64_v2-centos7-gcc12-dbg',
- 'x86_64_v2-centos7-gcc12+detdesc-opt', 'x86_64_v2-el9-gcc13+detdesc-opt',
- 'armv8.1_a-el9-gcc12-opt'
-]
-
-DEV11_PLATFORMS = SIM11_PLATFORMS + [
+ 'x86_64_v2-gcc13+detdesc-opt', 'x86_64_v2-el9-gcc13+detdesc-dbg',
'x86_64_v3-el9-gcc13-opt+g', 'armv8.1_a-el9-gcc13-opt'
]
+DEV11_PLATFORMS = SIM11_PLATFORMS
+
# Gauss Sim10 slots: on LHCb sim10-patches, Geant4 10.6.2.X single threaded, on Sim10/sim10-patches branch
@slot_factory
@@ -208,8 +205,6 @@ gaussSim10Gaudi = create_sim_slot(
'lhcb-sim10-gaudi-head',
'clone of lhcb-sim10 against next Gaudi and LCG',
platforms=DEV10GH_PLATFORMS)
-gaussSim10Gaudi.LCG.version = '104'
-gaussSim10Gaudi.Geant4.disabled = False
gaussSim10Gaudi.Geant4.version = 'sim10-patches'
gaussSim10Gaudi.Geant4.checkout_opts["merges"] = ["all"]
#gaussSim10Gaudi.Gaudi.version = 'HEAD'
@@ -274,13 +269,7 @@ gaussSim11 = create_gaussino_slot(
gaussSim11.projects.extend(
[Project('Lbcom', 'HEAD'),
Project('Boole', 'HEAD')])
-gaussSim11.LCG.version = '104'
-gaussSim11.Gaudi.version = 'v37r2'
-gaussSim11.Detector.version = 'v1r25'
-gaussSim11.LHCb.version = "v55r0"
-gaussSim11.Lbcom.version = "v35r0"
gaussSim11.Geant4.version = "v10r7p3t1"
-gaussSim11.GaussinoExtLibs.version = "v1r0"
gaussSim11.metadata["rebuildAlways"] = str(datetime.date.today())
slots.append(gaussSim11)
--
GitLab
From 1742023983895607a5ea4c280e443f5a3c4ed42c Mon Sep 17 00:00:00 2001
From: Gloria Corti <gloria.corti@cern.ch>
Date: Fri, 8 Mar 2024 11:33:22 +0100
Subject: [PATCH 2/2] restorre lcg for sim10 gaudi head
---
lhcbnightlyconf/Gauss.py | 3 +++
1 file changed, 3 insertions(+)
diff --git a/lhcbnightlyconf/Gauss.py b/lhcbnightlyconf/Gauss.py
index 7328396f..c75ad912 100644
--- a/lhcbnightlyconf/Gauss.py
+++ b/lhcbnightlyconf/Gauss.py
@@ -205,6 +205,8 @@ gaussSim10Gaudi = create_sim_slot(
'lhcb-sim10-gaudi-head',
'clone of lhcb-sim10 against next Gaudi and LCG',
platforms=DEV10GH_PLATFORMS)
+gaussSim10Gaudi.LCG.version = '105a'
+gaussSim10Gaudi.Geant4.disabled = False
gaussSim10Gaudi.Geant4.version = 'sim10-patches'
gaussSim10Gaudi.Geant4.checkout_opts["merges"] = ["all"]
#gaussSim10Gaudi.Gaudi.version = 'HEAD'
@@ -270,6 +272,7 @@ gaussSim11.projects.extend(
[Project('Lbcom', 'HEAD'),
Project('Boole', 'HEAD')])
gaussSim11.Geant4.version = "v10r7p3t1"
+gaussSim11.Geant4.disabled = False
gaussSim11.metadata["rebuildAlways"] = str(datetime.date.today())
slots.append(gaussSim11)
--
GitLab