From 8c409c8263ede62575612a4c857aa462205410bb Mon Sep 17 00:00:00 2001 From: Alexander Todorov Date: Tue, 27 Nov 2018 15:33:35 +0200 Subject: [PATCH] Use a temporary shared dir when testing otherwise composer-cli is unable to glob() the kickstart files and we're left without supported compose types. Seen during AWS testing for example. Helps with running some of the tests via sudo b/c this is what Jenkins requires. (cherry picked from commit b88466fd74813cb963ec660cb3dd9a9ca2b69d79) --- tests/test_cli.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/test_cli.sh b/tests/test_cli.sh index 03a57dda..9bb4ac12 100755 --- a/tests/test_cli.sh +++ b/tests/test_cli.sh @@ -6,11 +6,15 @@ rm -rf /var/tmp/beakerlib-*/ export top_srcdir=`pwd` . ./tests/testenv.sh -BLUEPRINTS_DIR=`mktemp -d '/tmp/blueprints.XXXXX'` +BLUEPRINTS_DIR=`mktemp -d '/tmp/composer-blueprints.XXXXX'` cp ./tests/pylorax/blueprints/*.toml $BLUEPRINTS_DIR +SHARE_DIR=`mktemp -d '/tmp/composer-share.XXXXX'` +cp -R ./share/* $SHARE_DIR +chmod a+rx -R $SHARE_DIR + # start the lorax-composer daemon -./src/sbin/lorax-composer --sharedir ./share/ $BLUEPRINTS_DIR & +./src/sbin/lorax-composer --sharedir $SHARE_DIR $BLUEPRINTS_DIR & # wait for the backend to become ready tries=0