Skip to content

Commit 57ad84e

Browse files
committed
MLE-24892 Backing off parallel config for now
Having issues on Jenkins, just want to get dynamic stages in place for now.
1 parent 3791e8a commit 57ad84e

File tree

1 file changed

+8
-18
lines changed

1 file changed

+8
-18
lines changed

Jenkinsfile

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ def tearDownDocker() {
162162
}
163163

164164
pipeline {
165-
agent none
165+
agent { label 'javaClientLinuxPool' }
166166

167167
options {
168168
checkoutToSubdirectory 'java-client-api'
@@ -185,7 +185,6 @@ pipeline {
185185
stages {
186186

187187
stage('pull-request-tests') {
188-
agent { label 'javaClientLinuxPool' }
189188
when {
190189
not {
191190
expression { return params.regressions }
@@ -223,7 +222,6 @@ pipeline {
223222
}
224223

225224
stage('publish') {
226-
agent { label 'javaClientLinuxPool' }
227225
when {
228226
branch 'develop'
229227
not {
@@ -255,28 +253,20 @@ pipeline {
255253
def imageTags = params.MARKLOGIC_IMAGE_TAGS.split(',')
256254
def imagePrefix = 'ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/'
257255

258-
def parallelStages = [:]
259-
260256
imageTags.each { tag ->
261257
def fullImage = imagePrefix + tag.trim()
262258
def stageName = "regressions-${tag.trim().replace(':', '-')}"
263259

264-
parallelStages[stageName] = {
265-
node('javaClientLinuxPool') {
266-
stage(stageName) {
267-
try {
268-
runTests(fullImage)
269-
} finally {
270-
junit '**/build/**/TEST*.xml'
271-
updateWorkspacePermissions()
272-
tearDownDocker()
273-
}
274-
}
260+
stage(stageName) {
261+
try {
262+
runTests(fullImage)
263+
} finally {
264+
junit '**/build/**/TEST*.xml'
265+
updateWorkspacePermissions()
266+
tearDownDocker()
275267
}
276268
}
277269
}
278-
279-
parallel parallelStages
280270
}
281271
}
282272
}

0 commit comments

Comments
 (0)