diff --git a/tests/parallel_test/run.sh b/tests/parallel_test/run.sh index 582615f62d84eea218dd3bab27421f380d211865..026bfb020d9a77d5cd1b05e9030cfce69a7ba4c7 100755 --- a/tests/parallel_test/run.sh +++ b/tests/parallel_test/run.sh @@ -140,7 +140,7 @@ function build_src() { flock -x $lock_file -c "echo \"${hosts[index]} taos-tools build failed\" >>$log_dir/failed.log" return fi - script="cp -rf ${workdirs[index]}/taos-tools/build/build/bin/* ${workdirs[index]}/TDinternal/debug/build/bin/;cp -rf ${workdirs[index]}/taos-tools/build/build/lib/* ${workdirs[index]}/TDinternal/debug/build/lib/;cp -rf ${workdirs[index]}/taos-tools/build/build/lib64/* ${workdirs[index]}/TDinternal/debug/build/lib/;cp -rf ${workdirs[index]}/TDinternal/debug/build/bin/demo ${workdirs[index]}/TDinternal/debug/build/bin/taosdemo" + script="cp -rf ${workdirs[index]}/taos-tools/build/build/bin/* ${workdirs[index]}/TDinternal/debug/build/bin/;cp -rf ${workdirs[index]}/taos-tools/build/build/lib/* ${workdirs[index]}/TDinternal/debug/build/lib/;cp -rf ${workdirs[index]}/taos-tools/build/build/lib64/* ${workdirs[index]}/TDinternal/debug/build/lib/;cp -rf ${workdirs[index]}/TDinternal/debug/build/bin/taosBenchmark ${workdirs[index]}/TDinternal/debug/build/bin/taosdemo" cmd="${ssh_script} sh -c \"$script\"" ${cmd} } @@ -150,7 +150,7 @@ function rename_taosdemo() { if [ -z ${passwords[index]} ]; then ssh_script="ssh -o StrictHostKeyChecking=no ${usernames[index]}@${hosts[index]}" fi - local script="cp -rf ${workdirs[index]}/TDinternal/debug/build/bin/demo ${workdirs[index]}/TDinternal/debug/build/bin/taosdemo" + local script="cp -rf ${workdirs[index]}/TDinternal/debug/build/bin/taosBenchmark ${workdirs[index]}/TDinternal/debug/build/bin/taosdemo 2>/dev/null" cmd="${ssh_script} sh -c \"$script\"" ${cmd} } @@ -182,7 +182,7 @@ function run_thread() { fi local case_redo_time=`echo "$line"|cut -d, -f2` if [ -z "$case_redo_time" ]; then - case_redo_time=1 + case_redo_time=${DEFAULT_RETRY_TIME:-2} fi local exec_dir=`echo "$line"|cut -d, -f3` local case_cmd=`echo "$line"|cut -d, -f4` @@ -232,6 +232,10 @@ function run_thread() { if [ $? -eq 0 ]; then redo=1 fi + grep -q "ssh_exchange_identification: Connection closed by remote host" $log_dir/$case_file.log + if [ $? -eq 0 ]; then + redo=1 + fi grep -q "kex_exchange_identification: read: Connection reset by peer" $log_dir/$case_file.log if [ $? -eq 0 ]; then redo=1 @@ -273,7 +277,7 @@ function run_thread() { cat $log_dir/$case_file.log echo "=====================================================" echo -e "\e[34m log file: $log_dir/$case_file.log \e[0m" - if [ ! -z $corefile ]; then + if [ ! -z "$corefile" ]; then echo -e "\e[34m corefiles: $corefile \e[0m" fi fi diff --git a/tests/parallel_test/run_case.sh b/tests/parallel_test/run_case.sh index 5884f400b50701bedb70a314e346a9ed93a6b2b3..5b7802ac2b346547e4d2cd171e93c1d5937a5360 100755 --- a/tests/parallel_test/run_case.sh +++ b/tests/parallel_test/run_case.sh @@ -43,11 +43,17 @@ fi go env -w GOPROXY=https://goproxy.cn echo "StrictHostKeyChecking no" >>/etc/ssh/ssh_config -ln -s $CONTAINER_TESTDIR/debug/build/lib/libtaos.so /usr/lib/libtaos.so +ln -s /home/debug/build/lib/libtaos.so /usr/lib/libtaos.so 2>/dev/null npm config -g set unsafe-perm npm config -g set registry https://registry.npm.taobao.org mkdir -p /home/sim/tsim - +mkdir -p /var/lib/taos/subscribe +rm -rf ${CONTAINER_TESTDIR}/src/connector/nodejs/node_modules +rm -rf ${CONTAINER_TESTDIR}/tests/examples/nodejs/node_modules +rm -rf ${CONTAINER_TESTDIR}/tests/connectorTest/nodejsTest/nanosupport/node_modules +# ln -s /home/node_modules ${CONTAINER_TESTDIR}/src/connector/nodejs/ +# ln -s /home/node_modules ${CONTAINER_TESTDIR}/tests/examples/nodejs/ +# ln -s /home/node_modules ${CONTAINER_TESTDIR}/tests/connectorTest/nodejsTest/nanosupport/ # echo "$cmd"|grep -q "nodejs" # if [ $? -eq 0 ]; then # cd $CONTAINER_TESTDIR/src/connector/nodejs diff --git a/tests/parallel_test/run_container.sh b/tests/parallel_test/run_container.sh index 35e214d4ab4696a54be8bfb47216f13071bd803d..e0a2fc4dc8679356122afc6679e6748ab2f8f9e6 100755 --- a/tests/parallel_test/run_container.sh +++ b/tests/parallel_test/run_container.sh @@ -77,24 +77,29 @@ if [ $? -eq 0 ]; then -v $TMP_DIR/thread_volume/$thread_no/node_modules:${CONTAINER_TESTDIR}/tests/examples/nodejs/node_modules \ -v $TMP_DIR/thread_volume/$thread_no/node_modules:${CONTAINER_TESTDIR}/tests/connectorTest/nodejsTest/nanosupport/node_modules" fi +if [ -f "$REPDIR/src/plugins/taosadapter/example/config/taosadapter.toml" ]; then + TAOSADAPTER_TOML="-v $REPDIR/src/plugins/taosadapter/example/config/taosadapter.toml:/etc/taos/taosadapter.toml:ro" +fi docker run \ -v $REPDIR/tests:$CONTAINER_TESTDIR/tests \ -v $MOUNT_DIR \ -v "$TMP_DIR/thread_volume/$thread_no/sim:${CONTAINER_TESTDIR}/sim" \ -v ${TMP_DIR}/thread_volume/$thread_no/coredump:/home/coredump \ - -v $INTERNAL_REPDIR/debug:$CONTAINER_TESTDIR/debug:ro \ + -v $INTERNAL_REPDIR/debug:/home/debug:ro \ -v $REPDIR/deps:$CONTAINER_TESTDIR/deps:ro \ -v $REPDIR/src:$CONTAINER_TESTDIR/src \ -v $REPDIR/src/inc/taos.h:/usr/include/taos.h:ro \ + $TAOSADAPTER_TOML \ -v $REPDIR/tests/examples:$CONTAINER_TESTDIR/tests/examples \ -v $REPDIR/snap:$CONTAINER_TESTDIR/snap:ro \ -v $REPDIR/alert:$CONTAINER_TESTDIR/alert:ro \ -v $REPDIR/packaging/cfg/taos.cfg:/etc/taos/taos.cfg:ro \ + -v $REPDIR/packaging:$CONTAINER_TESTDIR/packaging:ro \ -v $REPDIR/README.md:$CONTAINER_TESTDIR/README.md:ro \ -v $REPDIR/src/connector/python/taos:/usr/local/lib/python3.8/site-packages/taos:ro \ - -e LD_LIBRARY_PATH=$CONTAINER_TESTDIR/debug/build/lib:$CONTAINER_TESTDIR/debug/build/lib64 \ - -e PATH=/usr/local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$CONTAINER_TESTDIR/debug/build/bin:/usr/local/go/bin:/usr/local/node-v12.20.0-linux-x64/bin:/usr/local/apache-maven-3.8.4/bin:/usr/local/jdk1.8.0_144/bin \ + -e LD_LIBRARY_PATH=/home/debug/build/lib:/home/debug/build/lib64 \ + -e PATH=/usr/local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/home/debug/build/bin:/usr/local/go/bin:/usr/local/node-v12.20.0-linux-x64/bin:/usr/local/apache-maven-3.8.4/bin:/usr/local/jdk1.8.0_144/bin \ -e JAVA_HOME=/usr/local/jdk1.8.0_144 \ --rm --ulimit core=-1 taos_test:v1.0 $CONTAINER_TESTDIR/tests/parallel_test/run_case.sh -d "$exec_dir" -c "$cmd" ret=$?