Skip to content

Commit 2ca1319

Browse files
committed
Update logic for setup work node
resolves: #4798 Signed-off-by: Lan Xia <[email protected]>
1 parent ab604a6 commit 2ca1319

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

buildenv/jenkins/JenkinsfileBase

+5-3
Original file line numberDiff line numberDiff line change
@@ -1223,8 +1223,9 @@ def triggerRerunJob () {
12231223
def rerunJobName = "${JOB_NAME}_rerun"
12241224
def newJobs = [:]
12251225
def childParams = []
1226-
echo "allocate a node for generating rerun job ..."
1227-
node {
1226+
echo "triggerRerunJob SETUP_LABEL: ${SETUP_LABEL}"
1227+
echo "triggerRerunJob allocate a node for generating rerun job ..."
1228+
node (SETUP_LABEL) {
12281229
generateJob(newJobs, rerunJobName, rerunJobName)
12291230
parallel newJobs
12301231

@@ -1265,7 +1266,8 @@ def run_parallel_tests() {
12651266
if (params.PARALLEL && params.PARALLEL != "None" && (NUM_MACHINES > 1 || params.TEST_TIME)) {
12661267
stage ("Parallel Tests") {
12671268
def childJobs = parallel parallel_tests
1268-
node {
1269+
echo "run_parallel_tests SETUP_LABEL: ${SETUP_LABEL}"
1270+
node (SETUP_LABEL) {
12691271
forceCleanWS()
12701272
try {
12711273
def buildPaths = ""

buildenv/jenkins/openjdk_tests

+2
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,8 @@ timestamps{
383383
}
384384
}
385385
if (currentBuild.result != 'FAILURE') {
386+
env.SETUP_LABEL = params.SETUP_LABEL ?: "ci.role.test"
387+
echo "SETUP_LABEL: ${SETUP_LABEL}"
386388
jenkinsfile.run_parallel_tests()
387389
jenkinsfile.triggerRerunJob()
388390
}

0 commit comments

Comments
 (0)