From 3d3de8ee4be902875338397d89477e68f04723bc Mon Sep 17 00:00:00 2001
From: Marco Cattaneo <marco.cattaneo@cern.ch>
Date: Tue, 7 May 2024 15:36:35 +0200
Subject: [PATCH] Build only the default PLATFORMS_RUN2 also in
run2-patches-dev4 and run2-gaudi-head slots
---
lhcbnightlyconf/Patches.py | 7 +------
lhcbnightlyconf/lcg_nightlies.py | 4 ++--
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/lhcbnightlyconf/Patches.py b/lhcbnightlyconf/Patches.py
index 5a422016..b0661a47 100644
--- a/lhcbnightlyconf/Patches.py
+++ b/lhcbnightlyconf/Patches.py
@@ -212,12 +212,7 @@ run2_gaudi_head = preparePatchesSlot(
run2_gaudi_head.Gaudi.version = "HEAD"
run2_gaudi_head.Gaudi.checkout_opts["merges"] = ["label=lhcb-gaudi-head"]
run2_gaudi_head.enabled = True
-run2_gaudi_head.platforms = [
- "x86_64_v2-el9-gcc13-opt",
- "x86_64_v2-el9-gcc13-dbg",
- "x86_64_v2-el9-clang16-opt",
- "x86_64_v2-el9-clang16-dbg",
-]
+run2_gaudi_head.platforms = PLATFORMS_RUN2
slots.append(run2_gaudi_head)
slot2023 = preparePatchesSlot("2023")
diff --git a/lhcbnightlyconf/lcg_nightlies.py b/lhcbnightlyconf/lcg_nightlies.py
index 013550f5..ccf25c24 100644
--- a/lhcbnightlyconf/lcg_nightlies.py
+++ b/lhcbnightlyconf/lcg_nightlies.py
@@ -16,7 +16,7 @@ import re
from lb.nightly.configuration import Project, slot_factory
from .Common import (DEFAULT_CACHE_ENTRIES, DEFAULT_REQUIRED_EXTERNALS,
- LCGToolchains)
+ PLATFORMS_RUN2, LCGToolchains)
from .Main import create_head_slot
from .Patches import preparePatchesSlot
@@ -121,7 +121,7 @@ run2_dev4.cache_entries = lcg['dev4'].cache_entries
run2_dev4.preconditions = lcg['dev4'].preconditions
run2_dev4.Gaudi.version = 'HEAD'
run2_dev4.desc = "clone of run2-patches against next Gaudi and LCG version"
-run2_dev4.platforms = list(lcg['dev4'].platforms)
+run2_dev4.platforms = PLATFORMS_RUN2
run2_dev4.enabled = lcg['dev4'].enabled
slots.append(run2_dev4)
--
GitLab