From d813e654b5b964f79857df3c9130f174443a76be Mon Sep 17 00:00:00 2001 From: zhongtao Date: Mon, 4 Dec 2023 09:44:42 +0000 Subject: [PATCH 46/64] !2292 bugfix for run.sh and add build notify msg for ENABLE_GRPC_REMOTE_CONNECT * bugfix for run.sh and add build notify msg for ENABLE_GRPC_REMOTE_CONNECT --- CI/test_cases/container_cases/run.sh | 6 +++--- cmake/options.cmake | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CI/test_cases/container_cases/run.sh b/CI/test_cases/container_cases/run.sh index 8ea3e514..1bfd388b 100755 --- a/CI/test_cases/container_cases/run.sh +++ b/CI/test_cases/container_cases/run.sh @@ -27,7 +27,8 @@ function do_test_t() { tid=`isula run --runtime $1 -tid --name hostname busybox` chostname=`isula exec -it $tid hostname` - fn_check_eq "$chostname" "${tid:0:12}" "default hostname is id of container" + clean_hostname=$(echo "$hostname" | sed 's/[\x01-\x1F\x7F]//g') + fn_check_eq "${clean_hostname}" "${tid:0:12}" "default hostname is not id of container" isula exec -it hostname env | grep HOSTNAME fn_check_eq "$?" "0" "check HOSTNAME env failed" isula stop -t 0 $tid @@ -149,13 +150,12 @@ function do_run_remote_test_t() isula run --runtime $1 -ti -H "$config" --name $containername busybox xxx [[ $? -eq 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - failed check invalid run ${containername} remote" && ((ret++)) - testcontainer $containername exited + isula rm -f -H "$config" $containername [[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - failed to rm container remote" && ((ret++)) isula run --runtime $1 -ti -H "$config" --name $containername busybox /bin/sh -c 'echo "hello"' | grep hello [[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - failed to run ${containername} remote" && ((ret++)) - testcontainer $containername exited isula rm -f -H "$config" $containername [[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - failed to rm container remote" && ((ret++)) diff --git a/cmake/options.cmake b/cmake/options.cmake index aeb24662..bf7db93a 100644 --- a/cmake/options.cmake +++ b/cmake/options.cmake @@ -110,6 +110,7 @@ option(ENABLE_GRPC_REMOTE_CONNECT "enable gRPC remote connect" OFF) if (ENABLE_GRPC_REMOTE_CONNECT STREQUAL "ON") add_definitions(-DENABLE_GRPC_REMOTE_CONNECT=1) set(ENABLE_GRPC_REMOTE_CONNECT 1) + message("${Green}-- enable gRPC remote connect${ColourReset}") endif() option(ENABLE_SHIM_V2 "enable shim v2 runtime" OFF) -- 2.42.0