From f932228a773b88bff555d9ae6105b83eeb0b47a9 Mon Sep 17 00:00:00 2001 From: Lan Xia Date: Wed, 4 Oct 2023 18:16:09 -0400 Subject: [PATCH] Update logic for setup work node resolves: https://github.com/adoptium/aqa-tests/issues/4798 Signed-off-by: Lan Xia --- buildenv/jenkins/JenkinsfileBase | 4 ++-- buildenv/jenkins/openjdk_tests | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/buildenv/jenkins/JenkinsfileBase b/buildenv/jenkins/JenkinsfileBase index 969efc11cf..b471938efe 100644 --- a/buildenv/jenkins/JenkinsfileBase +++ b/buildenv/jenkins/JenkinsfileBase @@ -1224,7 +1224,7 @@ def triggerRerunJob () { def newJobs = [:] def childParams = [] echo "allocate a node for generating rerun job ..." - node { + node (env.SETUP_LABEL) { generateJob(newJobs, rerunJobName, rerunJobName) parallel newJobs @@ -1265,7 +1265,7 @@ def run_parallel_tests() { if (params.PARALLEL && params.PARALLEL != "None" && (NUM_MACHINES > 1 || params.TEST_TIME)) { stage ("Parallel Tests") { def childJobs = parallel parallel_tests - node { + node (env.SETUP_LABEL) { forceCleanWS() try { def buildPaths = "" diff --git a/buildenv/jenkins/openjdk_tests b/buildenv/jenkins/openjdk_tests index 0a404a9d28..32d7267207 100644 --- a/buildenv/jenkins/openjdk_tests +++ b/buildenv/jenkins/openjdk_tests @@ -383,6 +383,8 @@ timestamps{ } } if (currentBuild.result != 'FAILURE') { + env.SETUP_LABEL = params.SETUP_LABEL ?: "ci.role.test" + echo "SETUP_LABEL: ${env.SETUP_LABEL}" jenkinsfile.run_parallel_tests() jenkinsfile.triggerRerunJob() }