From e73d742cd7deee396eac3c97664b40264ee358cb Mon Sep 17 00:00:00 2001 From: Daniel Nephin Date: Fri, 16 Feb 2018 17:29:19 -0500 Subject: [PATCH] Remove explicit DOCKER_API_VERSION from integration env setup Use the default version because it is used by the client package Signed-off-by: Daniel Nephin --- hack/make/.integration-daemon-start | 4 ---- 1 file changed, 4 deletions(-) diff --git a/hack/make/.integration-daemon-start b/hack/make/.integration-daemon-start index 7314f71c5c..20801fccee 100644 --- a/hack/make/.integration-daemon-start +++ b/hack/make/.integration-daemon-start @@ -7,10 +7,6 @@ export PATH="$base/binary-daemon:$base/dynbinary-daemon:$PATH" export TEST_CLIENT_BINARY=docker -# Do not bump this version! Integration tests should no longer rely on the docker cli, they should be -# API tests instead. For the existing tests the scripts will use a frozen version of the docker cli -# with a DOCKER_API_VERSION frozen to 1.30, which should ensure that the CI remains green at all times. -export DOCKER_API_VERSION=1.30 if [ -n "$DOCKER_CLI_PATH" ]; then export TEST_CLIENT_BINARY=/usr/local/cli/$(basename "$DOCKER_CLI_PATH") fi