From 9e007469ef0d206517618bcc66a379d024ed715c Mon Sep 17 00:00:00 2001 From: Stefan Scherer Date: Tue, 9 Feb 2021 20:39:54 +0100 Subject: [PATCH] Update CI to ubuntu-2004 Signed-off-by: Stefan Scherer --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d99c6054..e7c33215 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,7 +18,7 @@ def buildImage = { name, buildargs, pyTag -> } def buildImages = { -> - wrappedNode(label: "amd64 && ubuntu-1804 && overlay2", cleanWorkspace: true) { + 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"] - wrappedNode(label: "amd64 && ubuntu-1804 && 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 -> } { -> - wrappedNode(label: "amd64 && ubuntu-1804 && overlay2", cleanWorkspace: true) { + 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}"