From 2184cff59ce987bd090cb3a6f8cc7b556522cd35 Mon Sep 17 00:00:00 2001 From: Alexander Todorov Date: Wed, 21 Nov 2018 15:09:01 +0200 Subject: [PATCH] Teach test_cli.sh to execute test scripts via arguments this will be used to invoke scripts that build/push cloud images without having to duplicate the setup/teardown/report parts! (cherry picked from commit af2ae790ceacbef12b8afdd5bf654229a41c3dee) --- tests/test_cli.sh | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/tests/test_cli.sh b/tests/test_cli.sh index 9158f1f7..13115a0b 100755 --- a/tests/test_cli.sh +++ b/tests/test_cli.sh @@ -20,16 +20,25 @@ until curl -m 15 --unix-socket /run/weldr/api.socket http://localhost:4000/api/s echo "DEBUG: Waiting for backend API to become ready before testing ..." done; -# invoke cli/ tests -./tests/cli/test_blueprints_sanity.sh -./tests/cli/test_compose_sanity.sh -# need `losetup`, which needs Docker to be in privileged mode (--privileged), -# which is available only for `docker run`, however we use `docker build`! -# And all of this may not even work on Travis CI so disabling execution for now! -# maybe we will figure out how to execute these two scripts on internal Jenkins instance -#./tests/cli/test_compose_ext4-filesystem.sh -#./tests/cli/test_compose_partitioned-disk.sh +if [ -z "$*" ]; then + # invoke cli/ tests which can be executed without special preparation + ./tests/cli/test_blueprints_sanity.sh + ./tests/cli/test_compose_sanity.sh + # need `losetup`, which needs Docker to be in privileged mode (--privileged), + # which is available only for `docker run`, however we use `docker build`! + # And all of this may not even work on Travis CI so disabling execution for now! + # maybe we will figure out how to execute these two scripts on internal Jenkins instance + #./tests/cli/test_compose_ext4-filesystem.sh + #./tests/cli/test_compose_partitioned-disk.sh +else + # execute other cli tests which need more adjustments in the calling environment + # or can't be executed inside Travis CI + for TEST in "$*"; do + ./$TEST + done +fi + # Stop lorax-composer and remove /run/weldr/api.socket pkill -9 lorax-composer