kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Merge pull request #19102 from Microsoft/jjh/integ-daemon-stop 

Windows CI: No integration daemon stop
This commit is contained in:
Sebastiaan van Stijn 2016-01-05 20:52:51 +01:00
parent 4f8d794c46 a3858873fa
commit 2b489450d7
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hack/make/.integration-daemon-stop
View File

@ -1,5 +1,6 @@
#!/bin/bash #!/bin/bash
if [ ! "$(go env GOOS)" = 'windows' ]; then
trap - EXIT # reset EXIT trap applied in .integration-daemon-start trap - EXIT # reset EXIT trap applied in .integration-daemon-start
for pidFile in $(find "$DEST" -name docker.pid); do for pidFile in $(find "$DEST" -name docker.pid); do
@ -19,3 +20,8 @@ if [ -z "$DOCKER_TEST_HOST" ]; then
) )
fi fi
fi fi
else
# Note this script is not actionable on Windows to Linux CI. Instead the
# DIND daemon under test is torn down by the Jenkins tear-down script
echo "INFO: Not stopping daemon on Windows CI"
fi