diff options
Diffstat (limited to 'Jenkinsfile')
-rw-r--r-- | Jenkinsfile | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index 471072b..f524ae7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,6 @@ #!groovy def imageNameBase = "dockerpinata/docker-py" -def imageNamePy2 def imageNamePy3 def imageDindSSH def images = [:] @@ -22,12 +21,10 @@ def buildImages = { -> stage("build image") { checkout(scm) - imageNamePy2 = "${imageNameBase}:py2-${gitCommit()}" imageNamePy3 = "${imageNameBase}:py3-${gitCommit()}" imageDindSSH = "${imageNameBase}:sshdind-${gitCommit()}" withDockerRegistry(credentialsId:'dockerbuildbot-index.docker.io') { buildImage(imageDindSSH, "-f tests/Dockerfile-ssh-dind .", "") - buildImage(imageNamePy2, "-f tests/Dockerfile --build-arg PYTHON_VERSION=2.7 .", "py2.7") buildImage(imageNamePy3, "-f tests/Dockerfile --build-arg PYTHON_VERSION=3.7 .", "py3.7") } } @@ -73,7 +70,7 @@ def runTests = { Map settings -> throw new Exception("Need Docker version to test, e.g.: `runTests(dockerVersion: '19.03.12')`") } if (!pythonVersion) { - throw new Exception("Need Python version being tested, e.g.: `runTests(pythonVersion: 'py2.7')`") + throw new Exception("Need Python version being tested, e.g.: `runTests(pythonVersion: 'py3.7')`") } { -> |