beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #12583 from Mic92/hack/explicit-bundles

Browse source 
Hack/explicit bundles
This commit is contained in:
Jessie Frazelle 2015-06-09 14:34:52 -07:00
commit ceee2595b6
5 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
hack/make/.integration-daemon-setup Normal file
View file

@ -0,0 +1,5 @@
#!/bin/bash
bundle .ensure-emptyfs
bundle .ensure-frozen-images
bundle .ensure-httpserver

3
hack/make/.integration-daemon-start
View file

@ -49,7 +49,8 @@ if [ -z "$DOCKER_TEST_HOST" ]; then
$storage_params \
&> "$DEST/docker.log"
) &
trap "source '${MAKEDIR}/.integration-daemon-stop'" EXIT # make sure that if the script exits unexpectedly, we stop this daemon we just started
# make sure that if the script exits unexpectedly, we stop this daemon we just started
trap 'bundle .integration-daemon-stop' EXIT
else
export DOCKER_HOST="$DOCKER_TEST_HOST"
fi

5
hack/make/build-deb
View file

@ -4,8 +4,7 @@ set -e
# subshell so that we can export PATH and TZ without breaking other things
(
export TZ=UTC # make sure our "date" variables are UTC-based
source "${MAKEDIR}/.integration-daemon-start"
bundle .integration-daemon-start
# TODO consider using frozen images for the dockercore/builder-deb tags
@ -63,5 +62,5 @@ set -e
docker rmi "$tempImage"
done
source "${MAKEDIR}/.integration-daemon-stop"
bundle .test-integration-stop
) 2>&1 | tee -a "$DEST/test.log"

4
hack/make/test-docker-py
View file

@ -3,7 +3,7 @@ set -e
# subshell so that we can export PATH without breaking other things
(
source "${MAKEDIR}/.integration-daemon-start"
bundle .integration-daemon-start
dockerPy='/docker-py'
[ -d "$dockerPy" ] || {
@ -14,5 +14,5 @@ set -e
# exporting PYTHONPATH to import "docker" from our local docker-py
test_env PYTHONPATH="$dockerPy" python "$dockerPy/tests/integration_test.py"
source "${MAKEDIR}/.integration-daemon-stop"
bundle .integration-daemon-stop
) 2>&1 | tee -a "$DEST/test.log"

8
hack/make/test-integration-cli
View file

@ -7,13 +7,11 @@ bundle_test_integration_cli() {
# subshell so that we can export PATH without breaking other things
(
source "${MAKEDIR}/.integration-daemon-start"
bundle .integration-daemon-start
source "${MAKEDIR}/.ensure-frozen-images"
source "${MAKEDIR}/.ensure-httpserver"
source "${MAKEDIR}/.ensure-emptyfs"
bundle .integration-daemon-setup
bundle_test_integration_cli
source "${MAKEDIR}/.integration-daemon-stop"
bundle .integration-daemon-stop
) 2>&1 | tee -a "$DEST/test.log"