Merge pull request docker#2514 from thaJeztah/remove_obsolete_versions

Ulysses Souza · web-flow · commit 030af62dca98 · 2020-02-21T16:17:07.000+01:00
Jenkinsfile: remove obsolete engine versions
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -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'
   ]
diff --git a/Makefile b/Makefile
@@ -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:
