Skip to content

Commit 2c54188

Browse files
thaJeztahulyssessouza
authored andcommitted
Jenkinsfile: update node selection labels
Make sure we use the LTS nodes, to prevent using machines that we prepared with cgroups v2 (which is not yet supported by docker v19.03) Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent d40c061 commit 2c54188

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Jenkinsfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def buildImage = { name, buildargs, pyTag ->
1717
}
1818

1919
def buildImages = { ->
20-
wrappedNode(label: "ubuntu && !zfs && amd64", cleanWorkspace: true) {
20+
wrappedNode(label: "amd64 && ubuntu-1804 && overlay2", cleanWorkspace: true) {
2121
stage("build image") {
2222
checkout(scm)
2323

@@ -32,7 +32,7 @@ def buildImages = { ->
3232

3333
def getDockerVersions = { ->
3434
def dockerVersions = ["19.03.5"]
35-
wrappedNode(label: "ubuntu && !zfs && amd64") {
35+
wrappedNode(label: "amd64 && ubuntu-1804 && overlay2") {
3636
def result = sh(script: """docker run --rm \\
3737
--entrypoint=python \\
3838
${imageNamePy3} \\
@@ -73,7 +73,7 @@ def runTests = { Map settings ->
7373
}
7474

7575
{ ->
76-
wrappedNode(label: "ubuntu && !zfs && amd64", cleanWorkspace: true) {
76+
wrappedNode(label: "amd64 && ubuntu-1804 && overlay2", cleanWorkspace: true) {
7777
stage("test python=${pythonVersion} / docker=${dockerVersion}") {
7878
checkout(scm)
7979
def dindContainerName = "dpy-dind-\$BUILD_NUMBER-\$EXECUTOR_NUMBER-${pythonVersion}-${dockerVersion}"

0 commit comments

Comments
 (0)