diff --git a/Jenkinsfile2 b/Jenkinsfile2 index fceaa6554faa5bde7ae028ec9204627d505e8b95..1ef6926bda426a0fb0d5488af744078f30d2eaf2 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -268,11 +268,11 @@ pipeline { hostname ''' catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { - timeout(time: 20, unit: 'MINUTES') { + timeout(time: 21, unit: 'MINUTES') { sh ''' date cd ${WKC}/tests/parallel_test - time ./run.sh -m m.json -t cases.task -l ${LOGDIR} -b ${BRANCH_NAME} + timeout 1200 time ./run.sh -m m.json -t cases.task -l ${LOGDIR} -b ${BRANCH_NAME} date hostname ''' diff --git a/tests/docs-examples-test/test_R.sh b/tests/docs-examples-test/test_R.sh old mode 100644 new mode 100755 diff --git a/tests/docs-examples-test/test_c.sh b/tests/docs-examples-test/test_c.sh old mode 100644 new mode 100755 diff --git a/tests/docs-examples-test/test_csharp.sh b/tests/docs-examples-test/test_csharp.sh old mode 100644 new mode 100755 diff --git a/tests/docs-examples-test/test_go.sh b/tests/docs-examples-test/test_go.sh old mode 100644 new mode 100755 diff --git a/tests/docs-examples-test/test_java.sh b/tests/docs-examples-test/test_java.sh old mode 100644 new mode 100755 diff --git a/tests/docs-examples-test/test_node.sh b/tests/docs-examples-test/test_node.sh old mode 100644 new mode 100755 diff --git a/tests/docs-examples-test/test_python.sh b/tests/docs-examples-test/test_python.sh old mode 100644 new mode 100755 diff --git a/tests/docs-examples-test/test_rust.sh b/tests/docs-examples-test/test_rust.sh old mode 100644 new mode 100755 diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task index f7b616ab1d456b287af18c613af43cb5938c00fb..5145e95efc1e6bdb5ae556cea8506d30220bd3d9 100644 --- a/tests/parallel_test/cases.task +++ b/tests/parallel_test/cases.task @@ -150,6 +150,8 @@ 42,,script,./test.sh -f unique/dnode/monitor_bug.sim 42,,script,./test.sh -f unique/arbitrator/sync_replica3_alterTable_drop.sim 42,,script,./test.sh -f general/wal/kill.sim +41,,docs-examples-test,eval sh -c \"if [ `uname -m` != aarch64 ]; then ./test_csharp.sh; fi\" +41,,docs-examples-test,./test_c.sh 41,,script,./test.sh -f unique/dnode/lossdata.sim 41,,script,./test.sh -f unique/arbitrator/sync_replica3_dropDb.sim 41,,script,./test.sh -f unique/arbitrator/sync_replica2_alterTable_drop.sim @@ -174,6 +176,7 @@ 37,,script,./test.sh -f unique/arbitrator/offline_replica2_alterTable_online.sim 37,,script,./test.sh -f general/table/delete_reuse1.sim 37,,script,./test.sh -f general/db/delete_reuse2.sim +36,,docs-examples-test,eval sh -c \"if [ `uname -m` != aarch64 ]; then ./test_rust.sh; fi\" 36,,script,./test.sh -f unique/stable/replica3_vnode3.sim 36,,script,./test.sh -f unique/stable/dnode2_stop.sim 36,,script,./test.sh -f unique/arbitrator/sync_replica2_alterTable_add.sim @@ -305,6 +308,7 @@ 18,,pytest,python3 test.py -f query/queryTscomputWithNow.py 18,,pytest,python3 test.py -f query/queryInterval.py 18,,develop-test,python3 ./test.py -f 5-taos-tools/taosbenchmark/sml_telnet_alltypes.py +18,,docs-examples-test,./test_java.sh 17,,system-test,python3 ./test.py -f 5-taos-tools/taosbenchmark/taosdemoTestInsertWithJsonStmt-illegalData.py 17,,script,./test.sh -f unique/account/user_len.sim 17,,script,./test.sh -f general/vector/metrics_mix.sim @@ -529,6 +533,7 @@ 10,,script,./test.sh -f unique/stable/replica2_vnode3.sim 10,,pytest,python3 testCompress.py 10,,pytest,python3 test.py -f client/client.py +10,,docs-examples-test,./test_python.sh 9,,script,./test.sh -f general/parser/alter1.sim 9,,script,./test.sh -f general/db/delete.sim 9,,pytest,python3 test.py -f tools/taosdemoTestLimitOffset.py @@ -540,6 +545,7 @@ 9,,develop-test,python3 ./test.py -f 5-taos-tools/taosdump/taosdumpTestTypeSmallInt.py 9,,develop-test,python3 ./test.py -f 5-taos-tools/taosdump/taosdumpTestTypeFloat.py 9,,develop-test,python3 ./test.py -f 5-taos-tools/taosbenchmark/sml_json_alltypes.py +9,,docs-examples-test,./test_go.sh 8,,pytest,python3 test.py -f tools/taosdumpTest.py 8,,pytest,python3 test.py -f query/unionAllTest.py 8,,pytest,python3 test.py -f query/queryFilterTswithDateUnit.py @@ -558,6 +564,7 @@ 8,,develop-test,python3 ./test.py -f 5-taos-tools/taosbenchmark/subscripe_json.py 8,,develop-test,python3 ./test.py -f 5-taos-tools/taosbenchmark/invalid_commandline.py 8,,pytest,python3 test.py -f update/update2.py +7,,docs-examples-test,./test_node.sh 7,,system-test,python3 ./test.py -f 5-taos-tools/taosbenchmark/taosdemoTestInsertWithJsonSml-otherPara.py 7,,pytest,python3 test.py -f tools/taosdumpTest2.py 7,,pytest,python3 test.py -f tools/taosdemoTestdatatype.py @@ -750,3 +757,4 @@ 3,,develop-test,python3 ./test.py -f 2-query/ts_shortcut.py 3,,develop-test,python3 ./test.py -f 2-query/TD-13414.py 3,,develop-test,python3 ./test.py -f 5-taos-tools/taosdump/taosdumpTestInspect.py +1,,docs-examples-test, ./test_R.sh diff --git a/tests/parallel_test/run_container.sh b/tests/parallel_test/run_container.sh index 5c6751148a2a168934c9d155695bbf51ec01f77b..6ba16ee6467671dffda3b83f766f8fdb7247aeba 100755 --- a/tests/parallel_test/run_container.sh +++ b/tests/parallel_test/run_container.sh @@ -95,6 +95,7 @@ docker run \ -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/docs-examples:$CONTAINER_TESTDIR/docs-examples \ -v $REPDIR/src/connector/python/taos:/usr/local/lib/python3.8/site-packages/taos:ro \ -e LD_LIBRARY_PATH=/home/debug/build/lib:/home/debug/build/lib64 \ --rm --ulimit core=-1 taos_test:v1.0 $CONTAINER_TESTDIR/tests/parallel_test/run_case.sh -d "$exec_dir" -c "$cmd" $timeout_param