jenkins_tests.sh in vcloud-net_launcher-0.8.0 vs jenkins_tests.sh in vcloud-net_launcher-1.0.0

@@ -1,13 +1,15 @@
 #!/bin/bash
 set -eu
 
 function cleanup {
+  set +e
+  bundle exec vcloud-logout
   rm $FOG_RC
+  unset FOG_RC
 }
 
-# Override default of ~/.fog and delete afterwards.
 export FOG_RC=$(mktemp /tmp/vcloud_fog_rc.XXXXXXXXXX)
 trap cleanup EXIT
 
 cat <<EOF >${FOG_RC}
 ${FOG_CREDENTIAL}:
@@ -26,8 +28,7 @@
 rm -rf vcloud-tools-testing-config
 
 # Never log token to STDOUT.
 set +x
 eval $(printenv API_PASSWORD | bundle exec vcloud-login)
-trap "bundle exec vcloud-logout" EXIT
 
 bundle exec rake integration