Merge pull request #2514 from thaJeztah/remove_obsolete_versions

Jenkinsfile: remove obsolete engine versions
This commit is contained in:
Ulysses Souza 2020-02-21 16:17:07 +01:00 committed by GitHub
commit 030af62dca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions

4
Jenkinsfile vendored
View File

@ -31,7 +31,7 @@ def buildImages = { ->
}
def getDockerVersions = { ->
def dockerVersions = ["17.06.2-ce"]
def dockerVersions = ["19.03.5"]
wrappedNode(label: "ubuntu && !zfs && amd64") {
def result = sh(script: """docker run --rm \\
--entrypoint=python \\
@ -46,8 +46,6 @@ def getDockerVersions = { ->
def getAPIVersion = { engineVersion ->
def versionMap = [
'17.06': '1.30',
'18.03': '1.37',
'18.09': '1.39',
'19.03': '1.40'
]

View File

@ -42,7 +42,7 @@ integration-test-py3: build-py3
docker run -t --rm -v /var/run/docker.sock:/var/run/docker.sock docker-sdk-python3 py.test -v tests/integration/${file}
TEST_API_VERSION ?= 1.35
TEST_ENGINE_VERSION ?= 18.09.5
TEST_ENGINE_VERSION ?= 19.03.5
.PHONY: setup-network
setup-network: