docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1866 from docker/jenkins-update 

Shift test matrix forward
This commit is contained in:
Joffrey F 2018-01-24 18:04:42 -08:00 committed by GitHub
parent bc8ada2f74 ccd79323da
commit 766d890558
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Jenkinsfile vendored
View File

@ -5,7 +5,7 @@ def imageNamePy2
def imageNamePy3 def imageNamePy3
def images = [:] def images = [:]
def dockerVersions = ["17.06.2-ce", "17.09.0-ce", "17.10.0-ce"] def dockerVersions = ["17.06.2-ce", "17.12.0-ce", "18.01.0-ce"]
def buildImage = { name, buildargs, pyTag -> def buildImage = { name, buildargs, pyTag ->
img = docker.image(name) img = docker.image(name)
@ -33,7 +33,7 @@ def buildImages = { ->
} }
def getAPIVersion = { engineVersion -> def getAPIVersion = { engineVersion ->
def versionMap = ['17.06': '1.30', '17.09': '1.32', '17.10': '1.33'] def versionMap = ['17.06': '1.30', '17.12': '1.35', '18.01': '1.35']
return versionMap[engineVersion.substring(0, 5)] return versionMap[engineVersion.substring(0, 5)]
} }

4
Makefile
View File

@ -41,8 +41,8 @@ integration-test: build
integration-test-py3: build-py3 integration-test-py3: build-py3
docker run -t --rm -v /var/run/docker.sock:/var/run/docker.sock docker-sdk-python3 py.test tests/integration/${file} docker run -t --rm -v /var/run/docker.sock:/var/run/docker.sock docker-sdk-python3 py.test tests/integration/${file}
TEST_API_VERSION ?= 1.33 TEST_API_VERSION ?= 1.35
TEST_ENGINE_VERSION ?= 17.10.0-ce TEST_ENGINE_VERSION ?= 17.12.0-ce
.PHONY: integration-dind .PHONY: integration-dind
integration-dind: integration-dind-py2 integration-dind-py3 integration-dind: integration-dind-py2 integration-dind-py3

6
tests/integration/api_service_test.py
View File

@ -1096,11 +1096,13 @@ class ServiceTest(BaseAPIIntegrationTest):
) )
task_tmpl = docker.types.TaskTemplate(container_spec) task_tmpl = docker.types.TaskTemplate(container_spec)
net1 = self.client.create_network( net1 = self.client.create_network(
'dockerpytest_1', driver='overlay', ipam={'Driver': 'default'} self.get_service_name(), driver='overlay',
ipam={'Driver': 'default'}
) )
self.tmp_networks.append(net1['Id']) self.tmp_networks.append(net1['Id'])
net2 = self.client.create_network( net2 = self.client.create_network(
'dockerpytest_2', driver='overlay', ipam={'Driver': 'default'} self.get_service_name(), driver='overlay',
ipam={'Driver': 'default'}
) )
self.tmp_networks.append(net2['Id']) self.tmp_networks.append(net2['Id'])
name = self.get_service_name() name = self.get_service_name()