Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 8 additions & 18 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ def tearDownDocker() {
}

pipeline {
agent none
agent { label 'javaClientLinuxPool' }

options {
checkoutToSubdirectory 'java-client-api'
Expand All @@ -185,7 +185,6 @@ pipeline {
stages {

stage('pull-request-tests') {
agent { label 'javaClientLinuxPool' }
when {
not {
expression { return params.regressions }
Expand Down Expand Up @@ -223,7 +222,6 @@ pipeline {
}

stage('publish') {
agent { label 'javaClientLinuxPool' }
when {
branch 'develop'
not {
Expand Down Expand Up @@ -255,28 +253,20 @@ pipeline {
def imageTags = params.MARKLOGIC_IMAGE_TAGS.split(',')
def imagePrefix = 'ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/'

def parallelStages = [:]

imageTags.each { tag ->
def fullImage = imagePrefix + tag.trim()
def stageName = "regressions-${tag.trim().replace(':', '-')}"

parallelStages[stageName] = {
node('javaClientLinuxPool') {
stage(stageName) {
try {
runTests(fullImage)
} finally {
junit '**/build/**/TEST*.xml'
updateWorkspacePermissions()
tearDownDocker()
}
}
stage(stageName) {
try {
runTests(fullImage)
} finally {
junit '**/build/**/TEST*.xml'
updateWorkspacePermissions()
tearDownDocker()
}
}
}

parallel parallelStages
}
}
}
Expand Down