summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnca Iordache <aiordache@users.noreply.github.com>2021-02-11 17:16:49 +0100
committerGitHub <noreply@github.com>2021-02-11 17:16:49 +0100
commit407dcfd65ba81e8974c3dab5dd9499014e0f8b7f (patch)
treec83da8b05c34e5133fa431a87508063267a030a3
parentb3aa23943201f0018100740dc02aa938caf92bea (diff)
parent94d7983ef0e0a421fd1a84320dea960e78605ab3 (diff)
downloaddocker-py-407dcfd65ba81e8974c3dab5dd9499014e0f8b7f.tar.gz
Merge pull request #2763 from StefanScherer/revert-to-wrappedNode
Revert back to wrappedNode
-rw-r--r--Jenkinsfile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Jenkinsfile b/Jenkinsfile
index d333f42..e7c3321 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -18,7 +18,7 @@ def buildImage = { name, buildargs, pyTag ->
}
def buildImages = { ->
- node("amd64 && ubuntu-2004 && overlay2") {
+ wrappedNode(label: "amd64 && ubuntu-2004 && overlay2", cleanWorkspace: true) {
stage("build image") {
checkout(scm)
@@ -36,7 +36,7 @@ def buildImages = { ->
def getDockerVersions = { ->
def dockerVersions = ["19.03.12"]
- node("amd64 && ubuntu-2004 && overlay2") {
+ wrappedNode(label: "amd64 && ubuntu-2004 && overlay2") {
def result = sh(script: """docker run --rm \\
--entrypoint=python \\
${imageNamePy3} \\
@@ -77,7 +77,7 @@ def runTests = { Map settings ->
}
{ ->
- node("amd64 && ubuntu-2004 && overlay2") {
+ wrappedNode(label: "amd64 && ubuntu-2004 && overlay2", cleanWorkspace: true) {
stage("test python=${pythonVersion} / docker=${dockerVersion}") {
checkout(scm)
def dindContainerName = "dpy-dind-\$BUILD_NUMBER-\$EXECUTOR_NUMBER-${pythonVersion}-${dockerVersion}"