File tree 2 files changed +7
-3
lines changed
2 files changed +7
-3
lines changed Original file line number Diff line number Diff line change @@ -1223,8 +1223,9 @@ def triggerRerunJob () {
1223
1223
def rerunJobName = " ${ JOB_NAME} _rerun"
1224
1224
def newJobs = [:]
1225
1225
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 ) {
1228
1229
generateJob(newJobs, rerunJobName, rerunJobName)
1229
1230
parallel newJobs
1230
1231
@@ -1265,7 +1266,8 @@ def run_parallel_tests() {
1265
1266
if (params. PARALLEL && params. PARALLEL != " None" && (NUM_MACHINES > 1 || params. TEST_TIME )) {
1266
1267
stage (" Parallel Tests" ) {
1267
1268
def childJobs = parallel parallel_tests
1268
- node {
1269
+ echo " run_parallel_tests SETUP_LABEL: ${ SETUP_LABEL} "
1270
+ node (SETUP_LABEL ) {
1269
1271
forceCleanWS()
1270
1272
try {
1271
1273
def buildPaths = " "
Original file line number Diff line number Diff line change @@ -383,6 +383,8 @@ timestamps{
383
383
}
384
384
}
385
385
if (currentBuild. result != ' FAILURE' ) {
386
+ env. SETUP_LABEL = params. SETUP_LABEL ?: " ci.role.test"
387
+ echo " SETUP_LABEL: ${ SETUP_LABEL} "
386
388
jenkinsfile. run_parallel_tests()
387
389
jenkinsfile. triggerRerunJob()
388
390
}
You can’t perform that action at this time.
0 commit comments