Update logic for setup work node (#4800)

resolves: #4798 Signed-off-by: Lan Xia <Lan_Xia@ca.ibm.com>
adoptium · Oct 6, 2023 · 74be47c · 74be47c
1 parent f0538e7
commit 74be47c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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()
             }