Merge pull request #13169 from jfrazelle/cleanup-integration

cleanup test-integration

docs/sources/project/test-and-docs.md

@@ -67,10 +67,6 @@ is simply `test`. The make file contains several targets for testing:
     <td class="monospaced">test-unit</td>
     <td>Run just the unit tests.</td>
   </tr>
-  <tr>
-    <td class="monospaced">test-integration</td>
-    <td>Run just integration tests.</td>
-  </tr>
   <tr>
     <td class="monospaced">test-integration-cli</td>
     <td>Run the test for the integration command line interface.</td>
@@ -143,7 +139,7 @@ Try this now.
 
 3. Run the tests using the `hack/make.sh` script.
 
-        root@5f8630b873fe:/go/src/github.com/docker/docker# hack/make.sh dynbinary binary cross test-unit test-integration test-integration-cli test-docker-py
+        root@5f8630b873fe:/go/src/github.com/docker/docker# hack/make.sh dynbinary binary cross test-unit test-integration-cli test-docker-py
 
     The tests run just as they did within your local host.
 

hack/release.sh

@@ -54,7 +54,7 @@ RELEASE_BUNDLES=(
 
 if [ "$1" != '--release-regardless-of-test-failure' ]; then
 	RELEASE_BUNDLES=(
-		test-unit test-integration
+		test-unit
 		"${RELEASE_BUNDLES[@]}"
 		test-integration-cli
 	)