Skip to content

Commit 030af62

Browse files
author
Ulysses Souza
authored
Merge pull request #2514 from thaJeztah/remove_obsolete_versions
Jenkinsfile: remove obsolete engine versions
2 parents 12fe645 + 7bef5e8 commit 030af62

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

Jenkinsfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def buildImages = { ->
3131
}
3232

3333
def getDockerVersions = { ->
34-
def dockerVersions = ["17.06.2-ce"]
34+
def dockerVersions = ["19.03.5"]
3535
wrappedNode(label: "ubuntu && !zfs && amd64") {
3636
def result = sh(script: """docker run --rm \\
3737
--entrypoint=python \\
@@ -46,8 +46,6 @@ def getDockerVersions = { ->
4646

4747
def getAPIVersion = { engineVersion ->
4848
def versionMap = [
49-
'17.06': '1.30',
50-
'18.03': '1.37',
5149
'18.09': '1.39',
5250
'19.03': '1.40'
5351
]

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ integration-test-py3: build-py3
4242
docker run -t --rm -v /var/run/docker.sock:/var/run/docker.sock docker-sdk-python3 py.test -v tests/integration/${file}
4343

4444
TEST_API_VERSION ?= 1.35
45-
TEST_ENGINE_VERSION ?= 18.09.5
45+
TEST_ENGINE_VERSION ?= 19.03.5
4646

4747
.PHONY: setup-network
4848
setup-network:

0 commit comments

Comments
 (0)