diff options
| author | Joffrey F <joffrey@docker.com> | 2018-01-23 17:32:27 -0800 |
|---|---|---|
| committer | Joffrey F <joffrey@docker.com> | 2018-01-24 11:39:43 -0800 |
| commit | ccd79323dae2af09d58323c9fb0486b045e6730d (patch) | |
| tree | b53211f186db64696a17187726868a6cdcb12526 | |
| parent | bc8ada2f74b07c54aedfd8e88ae29acfc264f89e (diff) | |
| download | docker-py-jenkins-update.tar.gz | |
Shift test matrix forwardjenkins-update
Signed-off-by: Joffrey F <joffrey@docker.com>
| -rw-r--r-- | Jenkinsfile | 4 | ||||
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | tests/integration/api_service_test.py | 6 |
3 files changed, 8 insertions, 6 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index 6dc9a32..6d9d343 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,7 +5,7 @@ def imageNamePy2 def imageNamePy3 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 -> img = docker.image(name) @@ -33,7 +33,7 @@ def buildImages = { -> } 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)] } @@ -41,8 +41,8 @@ integration-test: build 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} -TEST_API_VERSION ?= 1.33 -TEST_ENGINE_VERSION ?= 17.10.0-ce +TEST_API_VERSION ?= 1.35 +TEST_ENGINE_VERSION ?= 17.12.0-ce .PHONY: integration-dind integration-dind: integration-dind-py2 integration-dind-py3 diff --git a/tests/integration/api_service_test.py b/tests/integration/api_service_test.py index 4a2093d..7620cb4 100644 --- a/tests/integration/api_service_test.py +++ b/tests/integration/api_service_test.py @@ -1096,11 +1096,13 @@ class ServiceTest(BaseAPIIntegrationTest): ) task_tmpl = docker.types.TaskTemplate(container_spec) 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']) 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']) name = self.get_service_name() |