diff --git a/test/tests/mqtrigger/kafka/test_kafka.sh b/test/tests/mqtrigger/kafka/test_kafka.sh index 47c30820..7bb205da 100755 --- a/test/tests/mqtrigger/kafka/test_kafka.sh +++ b/test/tests/mqtrigger/kafka/test_kafka.sh @@ -59,6 +59,7 @@ test_fnmessage() { export -f test_fnmessage cleanup() { + echo "previous response" $? log "Cleaning up..." clean_resource_by_id $TEST_ID rm -rf $tmp_dir diff --git a/test/tests/mqtrigger_kind_keda/kafka/test_kafka.sh b/test/tests/mqtrigger_kind_keda/kafka/test_kafka.sh index 955a12c3..1acc71fa 100755 --- a/test/tests/mqtrigger_kind_keda/kafka/test_kafka.sh +++ b/test/tests/mqtrigger_kind_keda/kafka/test_kafka.sh @@ -49,6 +49,7 @@ test_totalpods(){ export -f test_totalpods cleanup() { + echo "previous response" $? log "Cleaning up..." clean_resource_by_id $TEST_ID rm -rf $tmp_dir diff --git a/test/tests/test_annotations.sh b/test/tests/test_annotations.sh index cdc093f4..b717a4c8 100755 --- a/test/tests/test_annotations.sh +++ b/test/tests/test_annotations.sh @@ -27,6 +27,7 @@ log_exec() { } cleanup() { + echo "previous response" $? log "Cleaning up..." clean_resource_by_id $TEST_ID rm -rf $tmp_dir diff --git a/test/tests/test_archive_cli.sh b/test/tests/test_archive_cli.sh index dfb889a9..a43c154d 100755 --- a/test/tests/test_archive_cli.sh +++ b/test/tests/test_archive_cli.sh @@ -12,6 +12,7 @@ mkdir -p "$tmp_dir" podname=$(kubectl get pods -n fission | grep "storagesvc" |awk '{print $1}') cleanup() { + echo "previous response" $? log "Cleaning up..." clean_resource_by_id $TEST_ID rm -rf $tmp_dir diff --git a/test/tests/test_archive_pruner.sh b/test/tests/test_archive_pruner.sh index 8a52ccc3..99be9372 100755 --- a/test/tests/test_archive_pruner.sh +++ b/test/tests/test_archive_pruner.sh @@ -16,6 +16,7 @@ url="" cleanup() { + echo "previous response" $? log "Cleaning up..." clean_resource_by_id $TEST_ID rm -rf $tmp_dir diff --git a/test/tests/test_backend_newdeploy.sh b/test/tests/test_backend_newdeploy.sh index c79e731e..c86dcd3c 100755 --- a/test/tests/test_backend_newdeploy.sh +++ b/test/tests/test_backend_newdeploy.sh @@ -12,6 +12,7 @@ fn0=nodejs-hello-0-$TEST_ID fn1=nodejs-hello-1-$TEST_ID cleanup() { + echo "previous response" $? log "Cleaning up..." clean_resource_by_id $TEST_ID } diff --git a/test/tests/test_backend_poolmgr.sh b/test/tests/test_backend_poolmgr.sh index 11c3bdeb..e9debe60 100755 --- a/test/tests/test_backend_poolmgr.sh +++ b/test/tests/test_backend_poolmgr.sh @@ -12,6 +12,7 @@ env=nodejs-$TEST_ID fn=nodejs-hello-$TEST_ID cleanup() { + echo "previous response" $? log "Cleaning up..." clean_resource_by_id $TEST_ID } diff --git a/test/tests/test_buildermgr.sh b/test/tests/test_buildermgr.sh index 26bad003..207dd0c8 100755 --- a/test/tests/test_buildermgr.sh +++ b/test/tests/test_buildermgr.sh @@ -30,6 +30,7 @@ checkFunctionResponse() { } cleanup() { + echo "previous response" $? log "Cleaning up..." clean_resource_by_id $TEST_ID rm -rf $tmp_dir diff --git a/test/tests/test_canary.sh b/test/tests/test_canary.sh index 0c25ba8b..8429778c 100755 --- a/test/tests/test_canary.sh +++ b/test/tests/test_canary.sh @@ -23,6 +23,7 @@ canary_1=canary-1-$TEST_ID canary_2=canary-2-$TEST_ID echo "Exported all the things" cleanup() { + echo "previous response" $? log "Cleaning up..." clean_resource_by_id $TEST_ID rm -rf $tmp_dir diff --git a/test/tests/test_create_fn_with_url.sh b/test/tests/test_create_fn_with_url.sh index b3ca1d07..cfd6068e 100755 --- a/test/tests/test_create_fn_with_url.sh +++ b/test/tests/test_create_fn_with_url.sh @@ -14,6 +14,7 @@ code_url=https://raw.githubusercontent.com/fission/examples/master/nodejs/hello. base64val=$(wget -O- ${code_url} | base64) cleanup() { + echo "previous response" $? log "Cleaning up..." clean_resource_by_id $TEST_ID } diff --git a/test/tests/test_env_vars.sh b/test/tests/test_env_vars.sh index 8e3736cd..1d338b81 100755 --- a/test/tests/test_env_vars.sh +++ b/test/tests/test_env_vars.sh @@ -29,6 +29,7 @@ log_exec() { } cleanup() { + echo "previous response" $? log "Cleaning up..." clean_resource_by_id $TEST_ID rm -rf $tmp_dir diff --git a/test/tests/test_environments/test_go_env.sh b/test/tests/test_environments/test_go_env.sh index edbab6ae..b772010a 100755 --- a/test/tests/test_environments/test_go_env.sh +++ b/test/tests/test_environments/test_go_env.sh @@ -12,6 +12,7 @@ mkdir -p $tmp_dir ROOT=$(dirname $0)/../../.. cleanup() { + echo "previous response" $? log "Cleaning up..." clean_resource_by_id $TEST_ID rm -rf $tmp_dir diff --git a/test/tests/test_environments/test_java_builder.sh b/test/tests/test_environments/test_java_builder.sh index af40e3a0..be65857b 100755 --- a/test/tests/test_environments/test_java_builder.sh +++ b/test/tests/test_environments/test_java_builder.sh @@ -16,6 +16,7 @@ fn_p=pbuilderhello-$TEST_ID fn_n=nbuilderhello-$TEST_ID cleanup() { + echo "previous response" $? log "Cleaning up..." clean_resource_by_id $TEST_ID rm -rf $tmp_dir diff --git a/test/tests/test_environments/test_java_env.sh b/test/tests/test_environments/test_java_env.sh index cc1f162f..b87eaf50 100755 --- a/test/tests/test_environments/test_java_env.sh +++ b/test/tests/test_environments/test_java_env.sh @@ -15,6 +15,7 @@ fn_n=jvm-hello-n-$TEST_ID fn_p=jvm-hello-p-$TEST_ID cleanup() { + echo "previous response" $? log "Cleaning up..." clean_resource_by_id $TEST_ID } diff --git a/test/tests/test_environments/test_jvm_jersey_env.sh b/test/tests/test_environments/test_jvm_jersey_env.sh index 4b267fbc..44a7c38e 100755 --- a/test/tests/test_environments/test_jvm_jersey_env.sh +++ b/test/tests/test_environments/test_jvm_jersey_env.sh @@ -140,6 +140,7 @@ END ) cleanup() { + echo "previous response" $? clean_resource_by_id $TEST_ID } diff --git a/test/tests/test_environments/test_nodejs_env.sh b/test/tests/test_environments/test_nodejs_env.sh index 5085a480..2b6c2fc5 100755 --- a/test/tests/test_environments/test_nodejs_env.sh +++ b/test/tests/test_environments/test_nodejs_env.sh @@ -12,6 +12,7 @@ mkdir -p $tmp_dir ROOT=$(dirname $0)/../../.. cleanup() { + echo "previous response" $? log "Cleaning up..." clean_resource_by_id $TEST_ID rm -rf $tmp_dir diff --git a/test/tests/test_environments/test_python_env.sh b/test/tests/test_environments/test_python_env.sh index 5481aadf..9e069915 100755 --- a/test/tests/test_environments/test_python_env.sh +++ b/test/tests/test_environments/test_python_env.sh @@ -12,6 +12,7 @@ mkdir -p $tmp_dir ROOT=$(dirname $0)/../../.. cleanup() { + echo "previous response" $? log "Cleaning up..." clean_resource_by_id $TEST_ID rm -rf $tmp_dir diff --git a/test/tests/test_environments/test_tensorflow_serving_env.sh b/test/tests/test_environments/test_tensorflow_serving_env.sh index 57d0051f..e31b5fad 100755 --- a/test/tests/test_environments/test_tensorflow_serving_env.sh +++ b/test/tests/test_environments/test_tensorflow_serving_env.sh @@ -12,6 +12,7 @@ mkdir -p $tmp_dir ROOT=$(dirname $0)/../../.. cleanup() { + echo "previous response" $? log "Cleaning up..." clean_resource_by_id $TEST_ID rm -rf $tmp_dir diff --git a/test/tests/test_fn_update/test_configmap_update.sh b/test/tests/test_fn_update/test_configmap_update.sh index 830d1092..60170811 100755 --- a/test/tests/test_fn_update/test_configmap_update.sh +++ b/test/tests/test_fn_update/test_configmap_update.sh @@ -18,6 +18,7 @@ old_cfgmap=old-cfgmap-$TEST_ID new_cfgmap=new-cfgmap-$TEST_ID cleanup() { + echo "previous response" $? log "Cleaning up..." clean_resource_by_id $TEST_ID rm -rf $tmp_dir diff --git a/test/tests/test_fn_update/test_env_update.sh b/test/tests/test_fn_update/test_env_update.sh index 62acf953..22863f59 100755 --- a/test/tests/test_fn_update/test_env_update.sh +++ b/test/tests/test_fn_update/test_env_update.sh @@ -13,6 +13,7 @@ env_new=python-new-$TEST_ID fn=hellopy-$TEST_ID cleanup() { + echo "previous response" $? log "Cleaning up..." clean_resource_by_id $TEST_ID } diff --git a/test/tests/test_fn_update/test_idle_objects_reaper.sh b/test/tests/test_fn_update/test_idle_objects_reaper.sh index 4362546e..931cec7a 100755 --- a/test/tests/test_fn_update/test_idle_objects_reaper.sh +++ b/test/tests/test_fn_update/test_idle_objects_reaper.sh @@ -11,6 +11,7 @@ fn=hellopython-$TEST_ID ROOT=$(dirname $0)/../../.. cleanup() { + echo "previous response" $? log "Cleaning up..." clean_resource_by_id $TEST_ID } diff --git a/test/tests/test_fn_update/test_nd_pkg_update.sh b/test/tests/test_fn_update/test_nd_pkg_update.sh index ae6d04b7..c298a900 100755 --- a/test/tests/test_fn_update/test_nd_pkg_update.sh +++ b/test/tests/test_fn_update/test_nd_pkg_update.sh @@ -10,6 +10,7 @@ tmp_dir="/tmp/test-$TEST_ID" mkdir -p $tmp_dir cleanup() { + echo "previous response" $? log "Cleaning up..." clean_resource_by_id $TEST_ID rm -rf $tmp_dir diff --git a/test/tests/test_fn_update/test_poolmgr_nd.sh b/test/tests/test_fn_update/test_poolmgr_nd.sh index 37a70de2..1cc07069 100755 --- a/test/tests/test_fn_update/test_poolmgr_nd.sh +++ b/test/tests/test_fn_update/test_poolmgr_nd.sh @@ -12,6 +12,7 @@ env=python-$TEST_ID fn=hellopython-$TEST_ID cleanup() { + echo "previous response" $? log "Cleaning up..." clean_resource_by_id $TEST_ID } diff --git a/test/tests/test_fn_update/test_resource_change.sh b/test/tests/test_fn_update/test_resource_change.sh index 4d5ef823..0242fea4 100755 --- a/test/tests/test_fn_update/test_resource_change.sh +++ b/test/tests/test_fn_update/test_resource_change.sh @@ -22,6 +22,7 @@ minmem2=512 maxmem2=768 cleanup() { + echo "previous response" $? log "Cleaning up..." clean_resource_by_id $TEST_ID } diff --git a/test/tests/test_fn_update/test_scale_change.sh b/test/tests/test_fn_update/test_scale_change.sh index 85a8ec15..4487f95d 100755 --- a/test/tests/test_fn_update/test_scale_change.sh +++ b/test/tests/test_fn_update/test_scale_change.sh @@ -15,6 +15,7 @@ targetMaxScale=6 targetCpuPercent=60 cleanup() { + echo "previous response" $? log "Cleaning up..." clean_resource_by_id $TEST_ID } diff --git a/test/tests/test_fn_update/test_secret_update.sh b/test/tests/test_fn_update/test_secret_update.sh index 3b13cac3..fd4794cc 100755 --- a/test/tests/test_fn_update/test_secret_update.sh +++ b/test/tests/test_fn_update/test_secret_update.sh @@ -18,6 +18,7 @@ old_secret=old-secret-$TEST_ID new_secret=new-secret-$TEST_ID cleanup() { + echo "previous response" $? log "Cleaning up..." clean_resource_by_id $TEST_ID rm -rf $tmp_dir diff --git a/test/tests/test_function_test/test_fn_test.sh b/test/tests/test_function_test/test_fn_test.sh index bb7651e0..f19a3454 100755 --- a/test/tests/test_function_test/test_fn_test.sh +++ b/test/tests/test_function_test/test_fn_test.sh @@ -17,6 +17,7 @@ valid_fn_name=hello-$TEST_ID invalid_fn_name=errhello-$TEST_ID cleanup() { + echo "previous response" $? log "Cleaning up..." clean_resource_by_id $TEST_ID rm -rf $tmp_dir diff --git a/test/tests/test_function_timeout.sh b/test/tests/test_function_timeout.sh index f5a89b38..b0a7201f 100755 --- a/test/tests/test_function_timeout.sh +++ b/test/tests/test_function_timeout.sh @@ -17,6 +17,7 @@ fn=nodejs-hello-$TEST_ID export FISSION_ROUTER=localhost:8888 cleanup() { + echo "previous response" $? log "Cleaning up..." clean_resource_by_id $TEST_ID rm -rf $tmp_dir diff --git a/test/tests/test_function_update.sh b/test/tests/test_function_update.sh index 72a90e6f..f4333558 100755 --- a/test/tests/test_function_update.sh +++ b/test/tests/test_function_update.sh @@ -15,6 +15,7 @@ env=nodejs-$TEST_ID fn=nodejs-hello-$TEST_ID cleanup() { + echo "previous response" $? log "Cleaning up..." clean_resource_by_id $TEST_ID rm -rf $tmp_dir diff --git a/test/tests/test_huge_response/test_huge_response.sh b/test/tests/test_huge_response/test_huge_response.sh index a0d8a380..2a6385b2 100755 --- a/test/tests/test_huge_response/test_huge_response.sh +++ b/test/tests/test_huge_response/test_huge_response.sh @@ -11,6 +11,7 @@ ROOT=$(dirname $0)/../../.. pushd $ROOT/test/tests/test_huge_response cleanup() { + echo "previous response" $? log "Cleaning up..." clean_resource_by_id $TEST_ID rm -rf response.json diff --git a/test/tests/test_ingress.sh b/test/tests/test_ingress.sh index 293fc6d8..ee7e6fc6 100755 --- a/test/tests/test_ingress.sh +++ b/test/tests/test_ingress.sh @@ -17,6 +17,7 @@ hostName="test-$TEST_ID.com" routeName="ingress-$TEST_ID" cleanup() { + echo "previous response" $? log "Cleaning up..." clean_resource_by_id $TEST_ID } diff --git a/test/tests/test_internal_routes.sh b/test/tests/test_internal_routes.sh index ffd6e202..d884880a 100755 --- a/test/tests/test_internal_routes.sh +++ b/test/tests/test_internal_routes.sh @@ -22,6 +22,7 @@ f2=f2-$TEST_ID log $f1 $f2 cleanup() { + echo "previous response" $? log "Cleaning up..." clean_resource_by_id $TEST_ID rm -rf $tmp_dir diff --git a/test/tests/test_kubectl/test_kubectl.sh b/test/tests/test_kubectl/test_kubectl.sh index 58bc1048..0ce68403 100755 --- a/test/tests/test_kubectl/test_kubectl.sh +++ b/test/tests/test_kubectl/test_kubectl.sh @@ -14,6 +14,7 @@ ROOT=$(dirname $0)/../../.. cd $ROOT/test/tests/test_kubectl cleanup() { + echo "previous response" $? log "Cleaning up..." kubectl delete -f spec-yaml -R || true } diff --git a/test/tests/test_logging/test_function_logs.sh b/test/tests/test_logging/test_function_logs.sh index e58983bc..ec5b009e 100755 --- a/test/tests/test_logging/test_function_logs.sh +++ b/test/tests/test_logging/test_function_logs.sh @@ -15,6 +15,7 @@ env=nodejs-$TEST_ID fn=nodejs-logtest-$TEST_ID cleanup() { + echo "previous response" $? log "Cleaning up..." clean_resource_by_id $TEST_ID rm -rf $tmp_dir diff --git a/test/tests/test_node_hello_http.sh b/test/tests/test_node_hello_http.sh index e985f1d5..1f931e1e 100755 --- a/test/tests/test_node_hello_http.sh +++ b/test/tests/test_node_hello_http.sh @@ -12,6 +12,7 @@ env=nodejs-$TEST_ID fn=nodejs-hello-$TEST_ID cleanup() { + echo "previous response" $? log "Cleaning up..." clean_resource_by_id $TEST_ID } diff --git a/test/tests/test_obj_create_in_diff_ns.sh b/test/tests/test_obj_create_in_diff_ns.sh index 5a291632..26e3db92 100755 --- a/test/tests/test_obj_create_in_diff_ns.sh +++ b/test/tests/test_obj_create_in_diff_ns.sh @@ -19,6 +19,7 @@ final_cleanup() { trap final_cleanup EXIT cleanup() { + echo "previous response" $? [[ -n "${1+x}" && -n "${2+x}" ]]; fission env delete --name $1 --envns $2 || true [[ -n "${3+x}" && -n "${4+x}" ]]; fission fn delete --name $3 --fns $4 || true [[ -n "${5+x}" && -n "${6+x}" ]]; fission pkg delete --name $5 --pkgns $6 || true diff --git a/test/tests/test_package_checksum.sh b/test/tests/test_package_checksum.sh index 3e952dcc..8c57c585 100755 --- a/test/tests/test_package_checksum.sh +++ b/test/tests/test_package_checksum.sh @@ -25,6 +25,7 @@ checkpkgsum() { } cleanup() { + echo "previous response" $? log "Cleaning up..." clean_resource_by_id $TEST_ID rm -rf $tmp_dir diff --git a/test/tests/test_package_command.sh b/test/tests/test_package_command.sh index 3ea91203..1e81a955 100755 --- a/test/tests/test_package_command.sh +++ b/test/tests/test_package_command.sh @@ -41,6 +41,7 @@ checkFunctionResponse() { } cleanup() { + echo "previous response" $? log "Cleaning up..." clean_resource_by_id $TEST_ID rm -rf $tmp_dir diff --git a/test/tests/test_pass.sh b/test/tests/test_pass.sh index 07287dfc..8b886f68 100755 --- a/test/tests/test_pass.sh +++ b/test/tests/test_pass.sh @@ -10,6 +10,7 @@ tmp_dir="/tmp/test-$TEST_ID" mkdir -p $tmp_dir cleanup() { + echo "previous response" $? log "Cleaning up..." clean_resource_by_id $TEST_ID rm -rf $tmp_dir diff --git a/test/tests/test_secret_cfgmap/test_secret_cfgmap.sh b/test/tests/test_secret_cfgmap/test_secret_cfgmap.sh index 0ee0c699..ccceed15 100755 --- a/test/tests/test_secret_cfgmap/test_secret_cfgmap.sh +++ b/test/tests/test_secret_cfgmap/test_secret_cfgmap.sh @@ -19,6 +19,7 @@ fn_cfgmap=testcfgmap-$TEST_ID fn_cfgmap1=testcfgmap1-$TEST_ID cleanup() { + echo "previous response" $? log "Cleaning up..." clean_resource_by_id $TEST_ID rm -rf $tmp_dir diff --git a/test/tests/test_specs/test_spec.sh b/test/tests/test_specs/test_spec.sh index 4ad168f6..013899f6 100755 --- a/test/tests/test_specs/test_spec.sh +++ b/test/tests/test_specs/test_spec.sh @@ -15,6 +15,7 @@ env=python-$TEST_ID fn=spec-$TEST_ID cleanup() { + echo "previous response" $? log "Cleaning up..." clean_resource_by_id $TEST_ID rm -rf $tmp_dir diff --git a/test/tests/test_specs/test_spec_archive/test_spec_archive.sh b/test/tests/test_specs/test_spec_archive/test_spec_archive.sh index 2d2d611e..2a65de3d 100755 --- a/test/tests/test_specs/test_spec_archive/test_spec_archive.sh +++ b/test/tests/test_specs/test_spec_archive/test_spec_archive.sh @@ -5,6 +5,7 @@ source $(dirname $0)/../../../utils.sh ROOT=` realpath $(dirname $0)/../../../../` cleanup() { + echo "previous response" $? log "Cleaning up..." fission spec destroy rm -rf func diff --git a/test/tests/test_specs/test_spec_merge/test_spec_merge.sh b/test/tests/test_specs/test_spec_merge/test_spec_merge.sh index bbf2f5c3..2af9161c 100755 --- a/test/tests/test_specs/test_spec_merge/test_spec_merge.sh +++ b/test/tests/test_specs/test_spec_merge/test_spec_merge.sh @@ -9,6 +9,7 @@ env_n=nodend fn_nd=nodehellond cleanup() { + echo "previous response" $? log "Cleaning up..." fission spec destroy || true popd diff --git a/test/tests/test_specs/test_spec_multifile.sh b/test/tests/test_specs/test_spec_multifile.sh index 4d42f1a3..0b820bca 100755 --- a/test/tests/test_specs/test_spec_multifile.sh +++ b/test/tests/test_specs/test_spec_multifile.sh @@ -15,6 +15,7 @@ env=python-$TEST_ID fn=spec-$TEST_ID cleanup() { + echo "previous response" $? log "Cleaning up..." clean_resource_by_id $TEST_ID rm -rf $tmp_dir diff --git a/test/tests/websocket/test_ws.sh b/test/tests/websocket/test_ws.sh index b0a7a419..bfad6583 100755 --- a/test/tests/websocket/test_ws.sh +++ b/test/tests/websocket/test_ws.sh @@ -8,6 +8,7 @@ set -euo pipefail source $(dirname $0)/../../utils.sh cleanup() { + echo "previous response" $? log "Deleting websocket setup" fission spec destroy }