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

Update test engine versions in Jenkinsfile 

Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2017-10-25 15:14:19 -07:00 committed by Joffrey F
parent 93f2ab1530
commit 378bd76377
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Jenkinsfile vendored
View File

@ -6,7 +6,7 @@ def imageNamePy3
def images = [:]
def dockerVersions = ["1.13.1", "17.04.0-ce", "17.05.0-ce", "17.06.0-ce", "17.07.0-ce-rc3"]
def dockerVersions = ["17.06.2-ce", "17.09.0-ce", "17.10.0-ce"]
def buildImage = { name, buildargs, pyTag ->
img = docker.image(name)
@ -34,7 +34,7 @@ def buildImages = { ->
}
def getAPIVersion = { engineVersion ->
def versionMap = ['1.13.': '1.26', '17.04': '1.27', '17.05': '1.29', '17.06': '1.30', '17.07': '1.31']
def versionMap = ['17.06': '1.30', '17.09': '1.32', '17.10': '1.33']
return versionMap[engineVersion.substring(0, 5)]
}

4
Makefile
View File

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

2
tests/integration/api_build_test.py
View File

@ -210,7 +210,7 @@ class BuildTest(BaseAPIIntegrationTest):
pass
info = self.client.inspect_image('build1')
self.assertEqual(info['Config']['OnBuild'], [])
assert not info['Config']['OnBuild']
@requires_api_version('1.25')
def test_build_with_network_mode(self):