diff options
| author | Joffrey F <joffrey@docker.com> | 2017-10-25 15:14:19 -0700 |
|---|---|---|
| committer | Joffrey F <f.joffrey@gmail.com> | 2017-11-07 15:18:26 -0800 |
| commit | 65ba043d158792ea7a596f306293a6503cc12e9a (patch) | |
| tree | 3be49247b7817a38916766a564162b471ed13585 | |
| parent | 3bad05136a6366c4e4a80bc13a79250fd7ca2657 (diff) | |
| download | docker-py-65ba043d158792ea7a596f306293a6503cc12e9a.tar.gz | |
Update test engine versions in Jenkinsfile2.6.0
Signed-off-by: Joffrey F <joffrey@docker.com>
Conflicts:
Jenkinsfile
| -rw-r--r-- | Jenkinsfile | 4 | ||||
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | tests/integration/api_build_test.py | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index 178653a..e3168cd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,7 +5,7 @@ def imageNamePy2 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) @@ -33,7 +33,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)] } @@ -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.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 diff --git a/tests/integration/api_build_test.py b/tests/integration/api_build_test.py index 7a0e6b1..8e98cc9 100644 --- a/tests/integration/api_build_test.py +++ b/tests/integration/api_build_test.py @@ -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): |