From 67dcff18d987c2a57993407843e6ea74cf0f1d52 Mon Sep 17 00:00:00 2001 From: Jan Stodola Date: Fri, 25 Jan 2019 17:52:21 +0100 Subject: [PATCH] Collect results from all cleanup scripts Correctly detect if any of the executed cleanup scripts didn't pass. --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index b2d3eeb0..a85e232c 100644 --- a/Makefile +++ b/Makefile @@ -66,8 +66,12 @@ test_vmware: sudo -E ./tests/test_cli.sh tests/cli/test_build_and_deploy_vmware.sh clean_cloud_envs: + # clean beakerlib logs from previous executions + sudo rm -rf /var/tmp/beakerlib-*/ sudo -E ./tests/cleanup/remove_old_objects_aws.sh sudo -E ./tests/cleanup/remove_old_objects_openstack.sh + # make sure all cleanup scripts finished successfully + sudo sh -c 'grep RESULT_STRING /var/tmp/beakerlib-*/TestResults | grep -v PASS && exit 1 || exit 0' clean: -rm -rf build src/pylorax/version.py