tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-25 14:44:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

tests don't run in parallel

Browse Source 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
Nicolas De Loof 2019-12-04 10:33:54 +01:00 committed by Nicolas De loof
parent 8859ab0d66
commit 6b0acc9ecb
1 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
Jenkinsfile vendored
View File

@ -43,6 +43,7 @@ pipeline {
} }
stage('Test') { stage('Test') {
steps { steps {
// TODO use declarative 1.5.0 `matrix` once available on CI
script { script {
def testMatrix = [:] def testMatrix = [:]
baseImages.each { baseImage -> baseImages.each { baseImage ->
@ -86,27 +87,31 @@ def buildImage(baseImage) {
} }
def runTests(dockerVersion, pythonVersion, baseImage) { def runTests(dockerVersion, pythonVersion, baseImage) {
wrappedNode(label: "ubuntu && amd64 && !zfs", cleanWorkspace: true) { return {
stage("test python=${pythonVersion} / docker=${dockerVersion} / baseImage=${baseImage}") { stage("python=${pythonVersion} docker=${dockerVersion} ${baseImage}") {
def scmvar = checkout(scm) node("ubuntu && amd64 && !zfs") {
def imageName = "dockerbuildbot/compose:${baseImage}-${scmvar.GIT_COMMIT}" def scmvar = checkout(scm)
def storageDriver = sh(script: "docker info -f \'{{.Driver}}\'", returnStdout: true).trim() def imageName = "dockerbuildbot/compose:${baseImage}-${scmvar.GIT_COMMIT}"
echo "Using local system's storage driver: ${storageDriver}" def storageDriver = sh(script: "docker info -f \'{{.Driver}}\'", returnStdout: true).trim()
sh """docker run \\ echo "Using local system's storage driver: ${storageDriver}"
-t \\ withDockerRegistry(credentialsId:'dockerbuildbot-index.docker.io') {
--rm \\ sh """docker run \\
--privileged \\ -t \\
--volume="\$(pwd)/.git:/code/.git" \\ --rm \\
--volume="/var/run/docker.sock:/var/run/docker.sock" \\ --privileged \\
-e "TAG=${imageName}" \\ --volume="\$(pwd)/.git:/code/.git" \\
-e "STORAGE_DRIVER=${storageDriver}" \\ --volume="/var/run/docker.sock:/var/run/docker.sock" \\
-e "DOCKER_VERSIONS=${dockerVersion}" \\ -e "TAG=${imageName}" \\
-e "BUILD_NUMBER=${env.BUILD_NUMBER}" \\ -e "STORAGE_DRIVER=${storageDriver}" \\
-e "PY_TEST_VERSIONS=${pythonVersion}" \\ -e "DOCKER_VERSIONS=${dockerVersion}" \\
--entrypoint="script/test/ci" \\ -e "BUILD_NUMBER=${env.BUILD_NUMBER}" \\
${imageName} \\ -e "PY_TEST_VERSIONS=${pythonVersion}" \\
--verbose --entrypoint="script/test/ci" \\
""" ${imageName} \\
} --verbose
"""
}
}
}
} }
} }