From 4506ff3119cfb06a1f94082a89aedaf12df6e745 Mon Sep 17 00:00:00 2001 From: Paul Liljenberg Date: Tue, 26 Jan 2016 16:28:18 +0100 Subject: [PATCH] improve test-deb-install This PR adds support for using the DOCKER_BUILD_PKGS env var to better help defining what packege to build. It also adds support for the integration-daemon so we can run it as a bundle. Signed-off-by: Paul Liljenberg add directory test Adds missing directory test. This helps verifying that DOCKER_BUILD_PKGS is a directory and exists before continueing. Signed-off-by: Paul Liljenberg fix indent Signed-off-by: Paul Liljenberg Upstream-commit: 620b8250e85abbe284eb8d34799df1bb73d82d6a Component: engine --- components/engine/hack/make/test-deb-install | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/components/engine/hack/make/test-deb-install b/components/engine/hack/make/test-deb-install index ce1d9d4734..c4482cd428 100755 --- a/components/engine/hack/make/test-deb-install +++ b/components/engine/hack/make/test-deb-install @@ -12,7 +12,14 @@ fi test_deb_install(){ # test for each Dockerfile in contrib/builder - for dir in contrib/builder/deb/${PACKAGE_ARCH}/*/; do + + builderDir="contrib/builder/deb/${PACKAGE_ARCH}" + pkgs=( $(find "${builderDir}/"*/ -type d) ) + if [ ! -z "$DOCKER_BUILD_PKGS" ]; then + pkgs=( $(echo ${DOCKER_BUILD_PKGS[@]/#/$builderDir\/}) ) + fi + for dir in "${pkgs[@]}"; do + [ -d "$dir" ] || { echo >&2 "skipping nonexistent $dir"; continue; } local from="$(awk 'toupper($1) == "FROM" { print $2; exit }' "$dir/Dockerfile")" local dir=$(basename "$dir") @@ -54,4 +61,8 @@ test_deb_install(){ done } -test_deb_install +( + bundle .integration-daemon-start + test_deb_install + bundle .integration-daemon-stop +) 2>&1 | tee -a "$DEST/test.log"