diff options
| author | Joffrey F <joffrey@docker.com> | 2017-10-25 15:14:19 -0700 |
|---|---|---|
| committer | Joffrey F <joffrey@docker.com> | 2017-10-25 16:26:47 -0700 |
| commit | 2fa3a6c0b8d565cedc0aa3af9c51a39129a9f641 (patch) | |
| tree | 149395d347ae8905fc46c3d4ca5b5bdbc93fe152 | |
| parent | 93f2ab1530b86afb5020ba06d9786bc351b0996d (diff) | |
| download | docker-py-update_test_matrix.tar.gz | |
Update test engine versions in Jenkinsfileupdate_test_matrix
Signed-off-by: Joffrey F <joffrey@docker.com>
| -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 a83d7bf..e2b76ad 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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)] } @@ -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 diff --git a/tests/integration/api_build_test.py b/tests/integration/api_build_test.py index 21464ff..a808981 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): |