From 3c085628e74362805ec5aebe7a2c0c0c85a4ee25 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Tue, 14 Jul 2015 17:41:06 -0400 Subject: Fixes clean bug where $vm_dir is assumed to exist JIRA: BGS-60 Change-Id: Ida9458cf638eca81e6a3d67941203c605d9e4a8a Signed-off-by: Tim Rozet --- foreman/ci/clean.sh | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'foreman/ci') diff --git a/foreman/ci/clean.sh b/foreman/ci/clean.sh index 05c35fc..0dc34ed 100755 --- a/foreman/ci/clean.sh +++ b/foreman/ci/clean.sh @@ -118,17 +118,19 @@ fi ###destroy vagrant if [ $skip_vagrant -eq 0 ]; then - cd $vm_dir/foreman_vm - if vagrant destroy -f; then - echo "${blue}Successfully destroyed Foreman VM ${reset}" - else - echo "${red}Unable to destroy Foreman VM ${reset}" - echo "${blue}Checking if vagrant was already destroyed and no process is active...${reset}" - if ps axf | grep vagrant; then - echo "${red}Vagrant VM still exists...exiting ${reset}" - exit 1 + if [ -d $vm_dir/foreman_vm ]; then + cd $vm_dir/foreman_vm + if vagrant destroy -f; then + echo "${blue}Successfully destroyed Foreman VM ${reset}" else - echo "${blue}Vagrant process doesn't exist. Moving on... ${reset}" + echo "${red}Unable to destroy Foreman VM ${reset}" + echo "${blue}Checking if vagrant was already destroyed and no process is active...${reset}" + if ps axf | grep vagrant; then + echo "${red}Vagrant VM still exists...exiting ${reset}" + exit 1 + else + echo "${blue}Vagrant process doesn't exist. Moving on... ${reset}" + fi fi fi -- cgit 1.2.3-korg