feat(tests): keep test instances with SKIP_CLEANUP=true

Author: mboersma

tests/bin/test-integration-ec2.sh

@@ -21,9 +21,11 @@ export AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY?}
 pip install awscli boto docopt
 
 function cleanup_ec2 {
-    log_phase "Cleaning up"
-    aws cloudformation delete-stack --stack-name $STACK_NAME
-    python $DEIS_ROOT/contrib/ec2/route53-wildcard.py delete $DEIS_TEST_DOMAIN $ELB_DNS_NAME
+    if [ "$SKIP_CLEANUP" != true ]; then
+        log_phase "Cleaning up"
+        aws cloudformation delete-stack --stack-name $STACK_NAME
+        python $DEIS_ROOT/contrib/ec2/route53-wildcard.py delete $DEIS_TEST_DOMAIN $ELB_DNS_NAME
+    fi
 }
 
 # setup callbacks on process exit and error

tests/bin/test-setup.sh

@@ -87,13 +87,15 @@ ssh-add $DEIS_TEST_SSH_KEY
 
 # wipe out all vagrants & deis virtualboxen
 function cleanup {
-    log_phase "Cleaning up"
-    set +e
-    ${GOPATH}/src/github.com/deis/deis/tests/bin/destroy-all-vagrants.sh
-    VBoxManage list vms | grep deis | sed -n -e 's/^.* {\(.*\)}/\1/p' | xargs -L1 -I {} VBoxManage unregistervm {} --delete
-    vagrant global-status --prune
-    docker rm -f -v `docker ps | grep deis- | awk '{print $1}'` 2>/dev/null
-    log_phase "Test run complete"
+    if [ "$SKIP_CLEANUP" != true ]; then
+        log_phase "Cleaning up"
+        set +e
+        ${GOPATH}/src/github.com/deis/deis/tests/bin/destroy-all-vagrants.sh
+        VBoxManage list vms | grep deis | sed -n -e 's/^.* {\(.*\)}/\1/p' | xargs -L1 -I {} VBoxManage unregistervm {} --delete
+        vagrant global-status --prune
+        docker rm -f -v `docker ps | grep deis- | awk '{print $1}'` 2>/dev/null
+        log_phase "Test run complete"
+    fi
 }
 
 function dump_logs {