From 576fefba1c901d887c3b0c7b8352cc58754e3abe Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Thu, 29 Feb 2024 15:54:30 +0100 Subject: [PATCH] Fix cron DSL entries for the _nightly_node_labeler (#1120) Signed-off-by: Jose Luis Rivero --- jenkins-scripts/dsl/_configs_/Globals.groovy | 4 +--- jenkins-scripts/dsl/core.dsl | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/jenkins-scripts/dsl/_configs_/Globals.groovy b/jenkins-scripts/dsl/_configs_/Globals.groovy index d0e2ee9ca..e5530eb90 100644 --- a/jenkins-scripts/dsl/_configs_/Globals.groovy +++ b/jenkins-scripts/dsl/_configs_/Globals.groovy @@ -15,9 +15,7 @@ class Globals static CRON_ON_WEEKEND = 'H H * * 6-7' // Run nightly scheduler every 20 minutes being sure to // run it at 9 just before the nightly creation. - static CRON_NIGHTLY_NODES = [ - '*/20 9-23 * * *', - '*/20 0-8 * * *'] + static CRON_NIGHTLY_NODES = '*/20 9-23 * * * \n20 0-8 * * *' // Start the nightly generation 10 minutes after the nigthly node // initial generation diff --git a/jenkins-scripts/dsl/core.dsl b/jenkins-scripts/dsl/core.dsl index 0e8234b16..4976a3835 100644 --- a/jenkins-scripts/dsl/core.dsl +++ b/jenkins-scripts/dsl/core.dsl @@ -106,9 +106,7 @@ nightly_labeler.with label Globals.nontest_label("master") triggers { - Globals.CRON_NIGHTLY_NODES.each { cron_entry -> - cron(cron_entry) - } + cron(Globals.CRON_NIGHTLY_NODES) } steps