tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4112 from mikedougherty/rm-docs-checker 

Remove docs checker from Jenkinsfile and use cleanWorkspace option on wrappedNode
This commit is contained in:
Joffrey F 2016-11-03 17:22:05 -07:00 committed by GitHub
parent 969abca47f da1508051d
commit 9046e33ab2
1 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Jenkinsfile vendored
View File

@ -2,17 +2,10 @@
def image def image
def checkDocs = { ->
wrappedNode(label: 'linux') {
deleteDir(); checkout(scm)
documentationChecker("docs")
}
}
def buildImage = { -> def buildImage = { ->
wrappedNode(label: "linux && !zfs") { wrappedNode(label: "linux && !zfs", cleanWorkspace: true) {
stage("build image") { stage("build image") {
deleteDir(); checkout(scm) checkout(scm)
def imageName = "dockerbuildbot/compose:${gitCommit()}" def imageName = "dockerbuildbot/compose:${gitCommit()}"
image = docker.image(imageName) image = docker.image(imageName)
try { try {
@ -37,9 +30,9 @@ def runTests = { Map settings ->
} }
{ -> { ->
wrappedNode(label: "linux && !zfs") { wrappedNode(label: "linux && !zfs", cleanWorkspace: true) {
stage("test python=${pythonVersions} / docker=${dockerVersions}") { stage("test python=${pythonVersions} / docker=${dockerVersions}") {
deleteDir(); checkout(scm) checkout(scm)
def storageDriver = sh(script: 'docker info | awk -F \': \' \'$1 == "Storage Driver" { print $2; exit }\'', returnStdout: true).trim() def storageDriver = sh(script: 'docker info | awk -F \': \' \'$1 == "Storage Driver" { print $2; exit }\'', returnStdout: true).trim()
echo "Using local system's storage driver: ${storageDriver}" echo "Using local system's storage driver: ${storageDriver}"
sh """docker run \\ sh """docker run \\
@ -62,19 +55,10 @@ def runTests = { Map settings ->
} }
} }
def buildAndTest = { -> buildImage()
buildImage() // TODO: break this out into meaningful "DOCKER_VERSIONS" values instead of all
// TODO: break this out into meaningful "DOCKER_VERSIONS" values instead of all
parallel(
failFast: true,
all_py27: runTests(pythonVersions: "py27", dockerVersions: "all"),
all_py34: runTests(pythonVersions: "py34", dockerVersions: "all"),
)
}
parallel( parallel(
failFast: false, failFast: true,
docs: checkDocs, all_py27: runTests(pythonVersions: "py27", dockerVersions: "all"),
test: buildAndTest all_py34: runTests(pythonVersions: "py34", dockerVersions: "all"),
) )