Collect results from all cleanup scripts

Correctly detect if any of the executed cleanup scripts didn't pass.

(cherry picked from commit 67dcff18d9)
This commit is contained in:
Jan Stodola 2019-01-25 17:52:21 +01:00 committed by Brian C. Lane
parent fe091060b8
commit d23ec308d4

View File

@ -66,8 +66,12 @@ test_vmware:
sudo -E ./tests/test_cli.sh tests/cli/test_build_and_deploy_vmware.sh sudo -E ./tests/test_cli.sh tests/cli/test_build_and_deploy_vmware.sh
clean_cloud_envs: 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_aws.sh
sudo -E ./tests/cleanup/remove_old_objects_openstack.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: clean:
-rm -rf build src/pylorax/version.py -rm -rf build src/pylorax/version.py