Skip to content

D
docker-py
Kaydet (Commit) 921aba10 authored tarafından Joffrey F's avatar Joffrey F Kaydeden (comit) Joffrey F
Dosyalara gözat
Seçenekler

Update test versions 

Signed-off-by: 's avatarJoffrey F <joffrey@docker.com>
üst d9df2a8b
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
Jenkinsfile
Dosyayı görüntüle @ 921aba10
...@@ -6,7 +6,7 @@ def imageNamePy3 ...@@ -6,7 +6,7 @@ def imageNamePy3
def images = [:] def images = [:]
def dockerVersions = ["1.13.1", "17.04.0-ce", "17.05.0-ce", "17.06.0-ce"] def dockerVersions = ["1.13.1", "17.04.0-ce", "17.05.0-ce", "17.06.1-ce", "17.07.0-ce-rc3"]
def buildImage = { name, buildargs, pyTag -> def buildImage = { name, buildargs, pyTag ->
img = docker.image(name) img = docker.image(name)
...@@ -34,7 +34,7 @@ def buildImages = { -> ...@@ -34,7 +34,7 @@ def buildImages = { ->
} }
def getAPIVersion = { engineVersion -> def getAPIVersion = { engineVersion ->
def versionMap = ['1.13.': '1.26', '17.04': '1.27', '17.05': '1.29', '17.06': '1.30'] def versionMap = ['1.13.': '1.26', '17.04': '1.27', '17.05': '1.29', '17.06': '1.30', '17.07': '1.31']
return versionMap[engineVersion.substring(0, 5)] return versionMap[engineVersion.substring(0, 5)]
} }
......
Makefile
Dosyayı görüntüle @ 921aba10
...@@ -41,8 +41,8 @@ integration-test: build ...@@ -41,8 +41,8 @@ integration-test: build
integration-test-py3: build-py3 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} docker run --rm -v /var/run/docker.sock:/var/run/docker.sock docker-sdk-python3 py.test tests/integration/${file}
TEST_API_VERSION ?= 1.29 TEST_API_VERSION ?= 1.30
TEST_ENGINE_VERSION ?= 17.05.0-ce TEST_ENGINE_VERSION ?= 17.06.0-ce
.PHONY: integration-dind .PHONY: integration-dind
integration-dind: build build-py3 integration-dind: build build-py3
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment