E2E tests does cleanup only once for error

Author: 0405ysj

e2etests/cvdr/cvdr_create_with_branch_test.sh

@@ -8,7 +8,7 @@ HOSTNAME=$(cvdr host create)
 cleanup() {
     cvdr host delete ${HOSTNAME}
 }
-trap cleanup EXIT ERR
+trap cleanup EXIT
 
 cvdr create \
     --host=${HOSTNAME} \

e2etests/cvdr/cvdr_create_with_local_srcs_test.sh

@@ -19,7 +19,7 @@ HOSTNAME=$(cvdr host create)
 cleanup() {
     cvdr host delete ${HOSTNAME}
 }
-trap cleanup EXIT ERR
+trap cleanup EXIT
 
 cvdr create \
     --host=${HOSTNAME} \

e2etests/cvdr/cvdr_host_create_test.sh

@@ -7,7 +7,7 @@ validate_components
 cleanup() {
     cvdr host delete ${HOSTNAME[@]}
 }
-trap cleanup EXIT ERR
+trap cleanup EXIT
 for i in $(seq 0 1); do
     HOSTNAME[i]=$(cvdr host create)
     if [[ ! $(cvdr host list) =~ ${HOSTNAME[i]} ]]; then