From f193e7978158fb352c4cc08b80e7643c85f9e9a6 Mon Sep 17 00:00:00 2001 From: Sanket Sudake Date: Thu, 3 Jun 2021 14:31:40 +0530 Subject: [PATCH] Capture timestamp whenever cleanup is triggered in tests (#2054) Signed-off-by: Sanket Sudake --- test/tests/test_archive_pruner.sh | 1 + test/tests/test_environments/test_go_env.sh | 1 + test/tests/test_environments/test_java_builder.sh | 1 + test/tests/test_environments/test_java_env.sh | 1 + test/tests/test_environments/test_nodejs_env.sh | 1 + test/tests/test_environments/test_python_env.sh | 1 + test/tests/test_environments/test_tensorflow_serving_env.sh | 1 + test/tests/test_huge_response/test_huge_response.sh | 1 + test/tests/test_ingress.sh | 1 + test/tests/test_internal_routes.sh | 2 -- test/tests/test_kubectl/test_kubectl.sh | 1 + test/tests/test_specs/test_spec_merge/test_spec_merge.sh | 6 +++--- 12 files changed, 13 insertions(+), 5 deletions(-) diff --git a/test/tests/test_archive_pruner.sh b/test/tests/test_archive_pruner.sh index 5363e7b80..8a52ccc35 100755 --- a/test/tests/test_archive_pruner.sh +++ b/test/tests/test_archive_pruner.sh @@ -16,6 +16,7 @@ url="" cleanup() { + 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 5295f8600..8fff7bde1 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() { + 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 9d9636b1a..aa1cc841b 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() { + 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 673e849a2..cc1f162fe 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() { + log "Cleaning up..." 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 39c29715d..5085a480c 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() { + 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 34dd856f9..5481aadf9 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() { + 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 a225fbc5e..cc392663a 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() { + 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 63f8a52dc..a0d8a380f 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() { + log "Cleaning up..." clean_resource_by_id $TEST_ID rm -rf response.json popd diff --git a/test/tests/test_ingress.sh b/test/tests/test_ingress.sh index d047c8c5a..293fc6d88 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() { + 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 08dcf4154..ffd6e202b 100755 --- a/test/tests/test_internal_routes.sh +++ b/test/tests/test_internal_routes.sh @@ -36,8 +36,6 @@ fi log "Creating nodejs env" fission env create --name $env --image $NODE_RUNTIME_IMAGE - - for f in $f1 $f2 do echo "module.exports = function(context, callback) { callback(200, \"$f\n\"); }" > $tmp_dir/$f.js diff --git a/test/tests/test_kubectl/test_kubectl.sh b/test/tests/test_kubectl/test_kubectl.sh index 0fa97ac30..b8d7fe601 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() { + log "Cleaning up..." kubectl delete -f spec-yaml -R || true } 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 a10c6cc9e..bbf2f5c30 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,7 +9,7 @@ env_n=nodend fn_nd=nodehellond cleanup() { - echo "Cleaning up..." + log "Cleaning up..." fission spec destroy || true popd } @@ -32,11 +32,11 @@ fission fn test --name $fn_nd hnd=$(kubectl -n $FUNCTION_NAMESPACE get deployment -l=functionName=$fn_nd -ojsonpath='{.items[0].spec.template.spec.hostname}') if [[ "${hnd}" == "foo-bar" ]]; then - echo "Hostname matches for newdeployment function, podspec test 1/2 passsed" + log "Hostname matches for newdeployment function, podspec test 1/2 passsed" fi hnp=$(kubectl -n $FUNCTION_NAMESPACE get deployment -l=environmentName=$env_p -ojsonpath='{.items[0].spec.template.spec.hostname}') if [[ "${hnp}" == "foo-bar" ]]; then - echo "Hostname matches for poolmgr function, podspec test 2/2 passsed" + log "Hostname matches for poolmgr function, podspec test 2/2 passsed" fi