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

Merge pull request #2761 from StefanScherer/no-wrappedNode 

Remove wrappedNode
This commit is contained in:
Anca Iordache 2021-02-10 17:18:12 +01:00 committed by GitHub
parent caef663729 9556b890f9
commit b3aa239432
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Jenkinsfile vendored
View File

@ -18,7 +18,7 @@ def buildImage = { name, buildargs, pyTag ->
} }
def buildImages = { -> def buildImages = { ->
wrappedNode(label: "amd64 && ubuntu-2004 && overlay2", cleanWorkspace: true) { node("amd64 && ubuntu-2004 && overlay2") {
stage("build image") { stage("build image") {
checkout(scm) checkout(scm)
@ -36,7 +36,7 @@ def buildImages = { ->
def getDockerVersions = { -> def getDockerVersions = { ->
def dockerVersions = ["19.03.12"] def dockerVersions = ["19.03.12"]
wrappedNode(label: "amd64 && ubuntu-2004 && overlay2") { node("amd64 && ubuntu-2004 && overlay2") {
def result = sh(script: """docker run --rm \\ def result = sh(script: """docker run --rm \\
--entrypoint=python \\ --entrypoint=python \\
${imageNamePy3} \\ ${imageNamePy3} \\
@ -77,7 +77,7 @@ def runTests = { Map settings ->
} }
{ -> { ->
wrappedNode(label: "amd64 && ubuntu-2004 && overlay2", cleanWorkspace: true) { node("amd64 && ubuntu-2004 && overlay2") {
stage("test python=${pythonVersion} / docker=${dockerVersion}") { stage("test python=${pythonVersion} / docker=${dockerVersion}") {
checkout(scm) checkout(scm)
def dindContainerName = "dpy-dind-\$BUILD_NUMBER-\$EXECUTOR_NUMBER-${pythonVersion}-${dockerVersion}" def dindContainerName = "dpy-dind-\$BUILD_NUMBER-\$EXECUTOR_NUMBER-${pythonVersion}-${dockerVersion}"