mirror of https://github.com/docker/docker-py.git
				
				
				
			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 <github@gone.nl>
This commit is contained in:
		
							parent
							
								
									d40c061210
								
							
						
					
					
						commit
						2c54188438
					
				|  | @ -17,7 +17,7 @@ def buildImage = { name, buildargs, pyTag -> | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| def buildImages = { -> | def buildImages = { -> | ||||||
|   wrappedNode(label: "ubuntu && !zfs && amd64", cleanWorkspace: true) { |   wrappedNode(label: "amd64 && ubuntu-1804 && overlay2", cleanWorkspace: true) { | ||||||
|     stage("build image") { |     stage("build image") { | ||||||
|       checkout(scm) |       checkout(scm) | ||||||
| 
 | 
 | ||||||
|  | @ -32,7 +32,7 @@ def buildImages = { -> | ||||||
| 
 | 
 | ||||||
| def getDockerVersions = { -> | def getDockerVersions = { -> | ||||||
|   def dockerVersions = ["19.03.5"] |   def dockerVersions = ["19.03.5"] | ||||||
|   wrappedNode(label: "ubuntu && !zfs && amd64") { |   wrappedNode(label: "amd64 && ubuntu-1804 && overlay2") { | ||||||
|     def result = sh(script: """docker run --rm \\ |     def result = sh(script: """docker run --rm \\ | ||||||
|         --entrypoint=python \\ |         --entrypoint=python \\ | ||||||
|         ${imageNamePy3} \\ |         ${imageNamePy3} \\ | ||||||
|  | @ -73,7 +73,7 @@ def runTests = { Map settings -> | ||||||
|   } |   } | ||||||
| 
 | 
 | ||||||
|   { -> |   { -> | ||||||
|     wrappedNode(label: "ubuntu && !zfs && amd64", cleanWorkspace: true) { |     wrappedNode(label: "amd64 && ubuntu-1804 && overlay2", cleanWorkspace: true) { | ||||||
|       stage("test python=${pythonVersion} / docker=${dockerVersion}") { |       stage("test python=${pythonVersion} / docker=${dockerVersion}") { | ||||||
|         checkout(scm) |         checkout(scm) | ||||||
|         def dindContainerName = "dpy-dind-\$BUILD_NUMBER-\$EXECUTOR_NUMBER-${pythonVersion}-${dockerVersion}" |         def dindContainerName = "dpy-dind-\$BUILD_NUMBER-\$EXECUTOR_NUMBER-${pythonVersion}-${dockerVersion}" | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue