diff options
| author | Ulysses Souza <ulysses.souza@docker.com> | 2020-06-03 11:14:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-03 11:14:49 +0200 |
| commit | 5efe28149a2060ff64faab5d4c1566f4cb994792 (patch) | |
| tree | a1f5fd6d55d8781bffc4a90f4bdb2ac62012fcef | |
| parent | b49d22f053df1eb8c00fa42d03c422fd4e76442e (diff) | |
| parent | fefa96cd0ea968bfe1f0e98c0f3c455d82042020 (diff) | |
| download | docker-py-5efe28149a2060ff64faab5d4c1566f4cb994792.tar.gz | |
Merge pull request #2585 from thaJeztah/better_worker_selection
Jenkinsfile: update node selection labels
| -rw-r--r-- | Jenkinsfile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index f905325..8777214 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ def buildImage = { name, buildargs, pyTag -> } def buildImages = { -> - wrappedNode(label: "ubuntu && !zfs && amd64", cleanWorkspace: true) { + wrappedNode(label: "amd64 && ubuntu-1804 && overlay2", cleanWorkspace: true) { stage("build image") { checkout(scm) @@ -32,7 +32,7 @@ def buildImages = { -> def getDockerVersions = { -> def dockerVersions = ["19.03.5"] - wrappedNode(label: "ubuntu && !zfs && amd64") { + wrappedNode(label: "amd64 && ubuntu-1804 && overlay2") { def result = sh(script: """docker run --rm \\ --entrypoint=python \\ ${imageNamePy3} \\ @@ -73,7 +73,7 @@ def runTests = { Map settings -> } { -> - wrappedNode(label: "ubuntu && !zfs && amd64", cleanWorkspace: true) { + wrappedNode(label: "amd64 && ubuntu-1804 && overlay2", cleanWorkspace: true) { stage("test python=${pythonVersion} / docker=${dockerVersion}") { checkout(scm) def dindContainerName = "dpy-dind-\$BUILD_NUMBER-\$EXECUTOR_NUMBER-${pythonVersion}-${dockerVersion}" |