summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnca Iordache <aiordache@users.noreply.github.com>2021-02-10 17:18:12 +0100
committerGitHub <noreply@github.com>2021-02-10 17:18:12 +0100
commitb3aa23943201f0018100740dc02aa938caf92bea (patch)
tree94ff9021cf1a7dc32a9c35f2e8c696ceeec1f1cd
parentcaef663729b900bcde1cdba8e6657fa7ed408ab9 (diff)
parent9556b890f9a1a7488adac06792aecf767a20f1d3 (diff)
downloaddocker-py-b3aa23943201f0018100740dc02aa938caf92bea.tar.gz
Merge pull request #2761 from StefanScherer/no-wrappedNode
Remove wrappedNode
-rw-r--r--Jenkinsfile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Jenkinsfile b/Jenkinsfile
index e7c3321..d333f42 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -18,7 +18,7 @@ def buildImage = { name, buildargs, pyTag ->
}
def buildImages = { ->
- wrappedNode(label: "amd64 && ubuntu-2004 && overlay2", cleanWorkspace: true) {
+ node("amd64 && ubuntu-2004 && overlay2") {
stage("build image") {
checkout(scm)
@@ -36,7 +36,7 @@ def buildImages = { ->
def getDockerVersions = { ->
def dockerVersions = ["19.03.12"]
- wrappedNode(label: "amd64 && ubuntu-2004 && overlay2") {
+ node("amd64 && ubuntu-2004 && overlay2") {
def result = sh(script: """docker run --rm \\
--entrypoint=python \\
${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}") {
checkout(scm)
def dindContainerName = "dpy-dind-\$BUILD_NUMBER-\$EXECUTOR_NUMBER-${pythonVersion}-${dockerVersion}"