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 #4150 from shin-/test_only_ubuntu_host 

Limit testing pool to Ubuntu hosts to avoid errors with dind
This commit is contained in:
Joffrey F 2016-11-14 18:04:30 -08:00 committed by GitHub
parent 0e28163ccb 0291d9ade5
commit d7e9748501
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Jenkinsfile vendored
View File

@ -3,7 +3,7 @@
def image
def buildImage = { ->
wrappedNode(label: "linux && !zfs", cleanWorkspace: true) {
wrappedNode(label: "ubuntu && !zfs", cleanWorkspace: true) {
stage("build image") {
checkout(scm)
def imageName = "dockerbuildbot/compose:${gitCommit()}"
@ -30,7 +30,7 @@ def runTests = { Map settings ->
}
{ ->
wrappedNode(label: "linux && !zfs", cleanWorkspace: true) {
wrappedNode(label: "ubuntu && !zfs", cleanWorkspace: true) {
stage("test python=${pythonVersions} / docker=${dockerVersions}") {
checkout(scm)
def storageDriver = sh(script: 'docker info | awk -F \': \' \'$1 == "Storage Driver" { print $2; exit }\'', returnStdout: true).trim()