From 3c4b1dec849e20172a7bdaefe4cd29f018c6300c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Michael=20P=C3=B6hn?= Date: Sat, 25 Mar 2017 02:48:00 +0100 Subject: [PATCH] makebuildserver more robust codepath for vagrant destroy --- makebuildserver | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/makebuildserver b/makebuildserver index b5e65167..19ea04bd 100755 --- a/makebuildserver +++ b/makebuildserver @@ -324,16 +324,15 @@ def destroy_current_image(v, serverdir): logger.info('destroying buildserver vm, removing images and vagrant-configs...') - # cannot run vagrant without the config in the YAML file - if os.path.exists(os.path.join(serverdir, 'Vagrantfile.yaml')): - try: - v.destroy() - logger.debug('vagrant destroy completed') - except subprocess.CalledProcessError as e: - logger.debug('vagrant destroy failed: %s', e) - if logger.level <= logging.DEBUG: - logger.debug('Cannot run destroy vagrant setup since Vagrantfile.yaml is not setup!') + try: + v.destroy() + logger.debug('vagrant destroy completed') + except subprocess.CalledProcessError as e: + logger.debug('vagrant destroy failed: %s', e) + try: subprocess.check_call(['vagrant', 'global-status', '--prune']) + except subprocess.CalledProcessError as e: + logger.debug('pruning global vagrant status failed: %s', e) try: shutil.rmtree(os.path.join(serverdir, '.vagrant')) -- 2.30.2