jyapayne/compose
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4150 from shin-/test_only_ubuntu_host

Browse source 
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
commit d7e9748501
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Jenkinsfile vendored
View file

@ -3,7 +3,7 @@
def image def image
def buildImage = { -> def buildImage = { ->
wrappedNode(label: "linux && !zfs", cleanWorkspace: true) { wrappedNode(label: "ubuntu && !zfs", cleanWorkspace: true) {
stage("build image") { stage("build image") {
checkout(scm) checkout(scm)
def imageName = "dockerbuildbot/compose:${gitCommit()}" 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}") { stage("test python=${pythonVersions} / docker=${dockerVersions}") {
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()