Add cleanup function to test scripts (#863)

test/tests/test_package_command.sh

@@ -50,12 +50,23 @@ waitEnvBuilder() {
 }
 export -f waitEnvBuilder
 
+cleanup() {
+    log "Cleaning up..."
+    fission env delete --name python || true
+    fission fn delete --name $fn || true
+}
+
+if [ -z "${TEST_NOCLEANUP:-}" ]; then
+    trap cleanup EXIT
+else
+    log "TEST_NOCLEANUP is set; not cleaning up test artifacts afterwards."
+fi
+
 log "Pre-test cleanup"
 fission env delete --name python || true
 
 log "Creating python env"
 fission env create --name python --image $PYTHON_RUNTIME_IMAGE --builder $PYTHON_BUILDER_IMAGE
-trap "fission env delete --name python" EXIT
 
 timeout 180s bash -c "waitEnvBuilder python"
 
@@ -68,7 +79,6 @@ timeout 60s bash -c "waitBuild $pkgName"
 
 log "Creating function " $fn
 fission fn create --name $fn --pkg $pkgName --entrypoint "user.main"
-trap "fission fn delete --name $fn" EXIT
 
 log "Creating route"
 fission route create --function $fn --url /$fn --method GET
@@ -87,7 +97,6 @@ pkgName=$(fission package create --deploy demo-deploy-pkg.zip --env python| cut
 
 log "Updating function " $fn
 fission fn update --name $fn --pkg $pkgName --entrypoint "hello.main"
-trap "fission fn delete --name $fn" EXIT
 
 log "Waiting for router to update cache"
 sleep 3