diff --git a/Jenkinsfile b/Jenkinsfile index 90a30dbd21ecdff6db594a12feae245fb82be0e1..d89bdad681a3314e898517cb3c54a08da283f36f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,6 +8,7 @@ def skipbuild = 0 def win_stop = 0 def scope = [] def mod = [0,1,2,3,4] +def sim_mod = [0,1,2,3] def abortPreviousBuilds() { def currentJobName = env.JOB_NAME @@ -54,10 +55,10 @@ def pre_test(){ git checkout master ''' } - else if(env.CHANGE_TARGET == '2.4'){ + else if(env.CHANGE_TARGET == '2.0'){ sh ''' cd ${WKC} - git checkout 2.4 + git checkout 2.0 ''' } else{ @@ -86,10 +87,10 @@ def pre_test(){ git checkout master ''' } - else if(env.CHANGE_TARGET == '2.4'){ + else if(env.CHANGE_TARGET == '2.0'){ sh ''' cd ${WK} - git checkout 2.4 + git checkout 2.0 ''' } else{ @@ -129,10 +130,10 @@ def pre_test_noinstall(){ git checkout master ''' } - else if(env.CHANGE_TARGET == '2.4'){ + else if(env.CHANGE_TARGET == '2.0'){ sh ''' cd ${WKC} - git checkout 2.4 + git checkout 2.0 ''' } else{ @@ -161,10 +162,10 @@ def pre_test_noinstall(){ git checkout master ''' } - else if(env.CHANGE_TARGET == '2.4'){ + else if(env.CHANGE_TARGET == '2.0'){ sh ''' cd ${WK} - git checkout 2.4 + git checkout 2.0 ''' } else{ @@ -201,10 +202,10 @@ def pre_test_mac(){ git checkout master ''' } - else if(env.CHANGE_TARGET == '2.4'){ + else if(env.CHANGE_TARGET == '2.0'){ sh ''' cd ${WKC} - git checkout 2.4 + git checkout 2.0 ''' } else{ @@ -233,10 +234,10 @@ def pre_test_mac(){ git checkout master ''' } - else if(env.CHANGE_TARGET == '2.4'){ + else if(env.CHANGE_TARGET == '2.0'){ sh ''' cd ${WK} - git checkout 2.4 + git checkout 2.0 ''' } else{ @@ -279,10 +280,10 @@ def pre_test_win(){ git checkout master ''' } - else if(env.CHANGE_TARGET == '2.4'){ + else if(env.CHANGE_TARGET == '2.0'){ bat ''' cd C:\\workspace\\TDinternal\\community - git checkout 2.4 + git checkout 2.0 ''' } else{ @@ -310,10 +311,10 @@ def pre_test_win(){ git checkout master ''' } - else if(env.CHANGE_TARGET == '2.4'){ + else if(env.CHANGE_TARGET == '2.0'){ bat ''' cd C:\\workspace\\TDinternal - git checkout 2.4 + git checkout 2.0 ''' } else{ @@ -382,7 +383,9 @@ pipeline { temp = (gitlog =~ /\((.*?)\)/) temp = temp[0].remove(1) scope = temp.split(",") + scope = ['connector','query','insert','other','tools','taosAdapter'] Collections.shuffle mod + Collections.shuffle sim_mod } } @@ -400,10 +403,10 @@ pipeline { } parallel { stage('python_1') { - agent{label " slave1 || slave6 || slave11 || slave16 "} + agent{label " slave1 || slave11 "} steps { pre_test() - timeout(time: 55, unit: 'MINUTES'){ + timeout(time: 100, unit: 'MINUTES'){ script{ scope.each { sh """ @@ -417,10 +420,10 @@ pipeline { } } stage('python_2') { - agent{label " slave2 || slave7 || slave12 || slave17 "} + agent{label " slave2 || slave12 "} steps { pre_test() - timeout(time: 55, unit: 'MINUTES'){ + timeout(time: 100, unit: 'MINUTES'){ script{ scope.each { sh """ @@ -434,7 +437,7 @@ pipeline { } } stage('python_3') { - agent{label " slave3 || slave8 || slave13 ||slave18 "} + agent{label " slave3 || slave13 "} steps { timeout(time: 105, unit: 'MINUTES'){ pre_test() @@ -451,9 +454,9 @@ pipeline { } } stage('python_4') { - agent{label " slave4 || slave9 || slave14 || slave19 "} + agent{label " slave4 || slave14 "} steps { - timeout(time: 55, unit: 'MINUTES'){ + timeout(time: 100, unit: 'MINUTES'){ pre_test() script{ scope.each { @@ -469,9 +472,9 @@ pipeline { } } stage('python_5') { - agent{label " slave5 || slave10 || slave15 || slave20 "} + agent{label " slave5 || slave15 "} steps { - timeout(time: 55, unit: 'MINUTES'){ + timeout(time: 100, unit: 'MINUTES'){ pre_test() script{ scope.each { @@ -486,12 +489,204 @@ pipeline { } } } + stage('sim_1') { + agent{label " slave6 || slave16 "} + steps { + pre_test() + timeout(time: 100, unit: 'MINUTES'){ + script{ + scope.each { + sh """ + date + cd ${WKC}/tests + ./test-CI.sh sim 4 ${sim_mod[0]} + date""" + } + } + } + } + } + stage('sim_2') { + agent{label " slave7 || slave17 "} + steps { + pre_test() + timeout(time: 100, unit: 'MINUTES'){ + script{ + scope.each { + sh """ + date + cd ${WKC}/tests + ./test-CI.sh sim 4 ${sim_mod[1]} + date""" + } + } + } + } + } + stage('sim_3') { + agent{label " slave8 || slave18 "} + steps { + timeout(time: 105, unit: 'MINUTES'){ + pre_test() + script{ + scope.each { + sh """ + date + cd ${WKC}/tests + ./test-CI.sh sim 4 ${sim_mod[2]} + date""" + } + } + } + } + } + stage('sim_4') { + agent{label " slave9 || slave19 "} + steps { + timeout(time: 100, unit: 'MINUTES'){ + pre_test() + script{ + scope.each { + sh """ + date + cd ${WKC}/tests + ./test-CI.sh sim 4 ${sim_mod[3]} + date""" + } + } + + } + } + } + stage('other') { + agent{label " slave10 || slave20 "} + steps { + timeout(time: 100, unit: 'MINUTES'){ + pre_test() + timeout(time: 60, unit: 'MINUTES'){ + sh ''' + cd ${WKC}/tests/pytest + ./crash_gen.sh -a -p -t 4 -s 2000 + ''' + } + timeout(time: 60, unit: 'MINUTES'){ + sh ''' + cd ${WKC}/tests/pytest + rm -rf /var/lib/taos/* + rm -rf /var/log/taos/* + ./handle_crash_gen_val_log.sh + ''' + sh ''' + cd ${WKC}/tests/pytest + rm -rf /var/lib/taos/* + rm -rf /var/log/taos/* + ./handle_taosd_val_log.sh + ''' + } + catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { + sh ''' + cd ${WKC}/tests/pytest + ./valgrind-test.sh 2>&1 > mem-error-out.log + ./handle_val_log.sh + ''' + } + sh ''' + cd ${WKC}/tests + ./test-all.sh full unit + date + ''' + } + } + } + stage('centos7') { + agent{label " centos7 "} + steps { + pre_test_noinstall() + } + } + stage('ubuntu:trusty') { + agent{label " trusty "} + steps { + pre_test_noinstall() + } + } + stage('ubuntu:xenial') { + agent{label " xenial "} + steps { + pre_test_noinstall() + } + } + stage('ubuntu:bionic') { + agent{label " bionic "} + steps { + pre_test_noinstall() + } + } stage('Mac_build') { agent{label " catalina "} steps { pre_test_mac() } } + stage('arm64centos7') { + agent{label " arm64centos7 "} + steps { + pre_test_noinstall() + } + } + stage('arm64centos8') { + agent{label " arm64centos8 "} + steps { + pre_test_noinstall() + } + } + stage('arm32bionic') { + agent{label " arm32bionic "} + steps { + pre_test_noinstall() + } + } + stage('arm64bionic') { + agent{label " arm64bionic "} + steps { + pre_test_noinstall() + } + } + stage('arm64focal') { + agent{label " arm64focal "} + steps { + pre_test_noinstall() + } + } + stage('build'){ + agent{label " wintest "} + steps { + pre_test() + script{ + while(win_stop == 0){ + sleep(1) + } + } + } + } + stage('test'){ + agent{label "win"} + steps{ + + catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { + pre_test_win() + timeout(time: 20, unit: 'MINUTES'){ + bat''' + cd C:\\workspace\\TDinternal\\community\\tests\\pytest + .\\test-all.bat wintest + ''' + } + } + script{ + win_stop=1 + } + } + } } } } diff --git a/tests/pytest/fulltest-insert.sh b/tests/pytest/fulltest-insert.sh index 153bc072dba128fa8f5635e26aba0d30066b9c9a..495c6844b0186331b33416ec9eee7d0b4fbda79f 100755 --- a/tests/pytest/fulltest-insert.sh +++ b/tests/pytest/fulltest-insert.sh @@ -1,7 +1,6 @@ #!/bin/bash ulimit -c unlimited #======================p1-start=============== - python3 testCompress.py python3 testNoCompress.py python3 ./test.py -f import_merge/importBlock1HO.py @@ -130,9 +129,4 @@ python3 ./test.py -f update/merge_commit_last.py python3 ./test.py -f update/update_options.py python3 ./test.py -f update/merge_commit_data-0.py python3 ./test.py -f wal/addOldWalTest.py -python3 ./test.py -f wal/sdbComp.py - - - - - +# python3 ./test.py -f wal/sdbComp.py \ No newline at end of file diff --git a/tests/pytest/fulltest-others.sh b/tests/pytest/fulltest-others.sh index a081833ddb323ad1becfc24f48fdaaebac26b328..7d3db012d1521154cc9bfdf46f90aa213eddaeba 100755 --- a/tests/pytest/fulltest-others.sh +++ b/tests/pytest/fulltest-others.sh @@ -1,45 +1,34 @@ #!/bin/bash ulimit -c unlimited #======================p1-start=============== - #python3 ./test.py -f dbmgmt/database-name-boundary.py python3 test.py -f dbmgmt/nanoSecondCheck.py - # python3 ./test.py -f tsdb/tsdbComp.py - # user python3 ./test.py -f user/user_create.py python3 ./test.py -f user/pass_len.py - #======================p1-end=============== #======================p2-start=============== - # perfbenchmark python3 ./test.py -f perfbenchmark/bug3433.py #python3 ./test.py -f perfbenchmark/bug3589.py #python3 ./test.py -f perfbenchmark/taosdemoInsert.py - #alter table python3 ./test.py -f alter/alter_table_crash.py python3 ./test.py -f alter/alterTabAddTagWithNULL.py python3 ./test.py -f alter/alterTimestampColDataProcess.py - #======================p2-end=============== #======================p3-start=============== - python3 ./test.py -f alter/alter_table.py python3 ./test.py -f alter/alter_debugFlag.py python3 ./test.py -f alter/alter_keep.py python3 ./test.py -f alter/alter_cacheLastRow.py python3 ./test.py -f alter/alter_create_exception.py python3 ./test.py -f alter/alterColMultiTimes.py - #======================p3-end=============== #======================p4-start=============== - python3 ./test.py -f account/account_create.py - # client python3 ./test.py -f client/client.py python3 ./test.py -f client/version.py @@ -50,12 +39,10 @@ python3 ./test.py -f client/taoshellCheckCase.py # python3 ./test.py -f client/change_time_1_2.py python3 client/twoClients.py python3 testMinTablesPerVnode.py - # topic python3 ./test.py -f topic/topicQuery.py #======================p4-end=============== #======================p5-start=============== python3 ./test.py -f ../system-test/0-management/1-stable/create_col_tag.py python3 ./test.py -f ../develop-test/0-management/3-tag/json_tag.py - -#======================p5-end=============== +#======================p5-end=============== \ No newline at end of file diff --git a/tests/pytest/fulltest-query.sh b/tests/pytest/fulltest-query.sh index b36694017c405991271340c91d21da7ca2e1b21b..ef05ce4af872c5ba2ae95ee3d1f591be66e01af3 100755 --- a/tests/pytest/fulltest-query.sh +++ b/tests/pytest/fulltest-query.sh @@ -1,14 +1,11 @@ #!/bin/bash ulimit -c unlimited #======================p1-start=============== - # timezone python3 ./test.py -f TimeZone/TestCaseTimeZone.py - #stable python3 ./test.py -f stable/insert.py python3 ./test.py -f stable/query_after_reset.py - #table python3 ./test.py -f table/alter_wal0.py python3 ./test.py -f table/column_name.py @@ -22,7 +19,6 @@ python3 ./test.py -f table/boundary.py #python3 ./test.py -f table/create.py python3 ./test.py -f table/del_stable.py python3 ./test.py -f table/create_db_from_normal_db.py - # tag python3 ./test.py -f tag_lite/filter.py python3 ./test.py -f tag_lite/create-tags-boundary.py @@ -38,10 +34,8 @@ python3 ./test.py -f tag_lite/bool_binary.py python3 ./test.py -f tag_lite/bool_int.py python3 ./test.py -f tag_lite/bool.py python3 ./test.py -f tag_lite/change.py - #======================p1-end=============== #======================p2-start=============== - python3 ./test.py -f tag_lite/column.py python3 ./test.py -f tag_lite/commit.py python3 ./test.py -f tag_lite/create.py @@ -65,10 +59,8 @@ python3 ./test.py -f tag_lite/unsignedTinyint.py python3 ./test.py -f tag_lite/alter_tag.py python3 ./test.py -f tag_lite/drop_auto_create.py python3 ./test.py -f tag_lite/json_tag_extra.py - #======================p2-end=============== #======================p3-start=============== - #query python3 ./test.py -f query/distinctOneColTb.py python3 ./test.py -f query/filter.py @@ -118,10 +110,8 @@ python3 ./test.py -f query/subqueryFilter.py python3 ./test.py -f query/nestedQuery/queryInterval.py python3 ./test.py -f query/queryStateWindow.py # python3 ./test.py -f query/nestedQuery/queryWithOrderLimit.py - #======================p3-end=============== #======================p4-start=============== - python3 ./test.py -f query/nestquery_last_row.py python3 ./test.py -f query/nestedQuery/nestedQuery.py python3 ./test.py -f query/nestedQuery/nestedQuery_datacheck.py @@ -145,7 +135,6 @@ python3 ./test.py -f query/query.py python3 ./test.py -f query/queryDiffColsTagsAndOr.py python3 ./test.py -f query/queryGroupTbname.py python3 ./test.py -f query/queryRegex.py - #stream python3 ./test.py -f stream/metric_1.py python3 ./test.py -f stream/metric_n.py @@ -159,18 +148,14 @@ python3 ./test.py -f stream/table_1.py python3 ./test.py -f stream/table_n.py python3 ./test.py -f stream/showStreamExecTimeisNull.py python3 ./test.py -f stream/cqSupportBefore1970.py - python3 ./test.py -f query/queryGroupbyWithInterval.py python3 queryCount.py - # subscribe python3 test.py -f subscribe/singlemeter.py #python3 test.py -f subscribe/stability.py python3 test.py -f subscribe/supertable.py - #======================p4-end=============== #======================p5-start=============== - # functions python3 ./test.py -f functions/all_null_value.py python3 ./test.py -f functions/function_avg.py -r 1 @@ -208,12 +193,6 @@ python3 ./test.py -f functions/function_mavg.py python3 ./test.py -f functions/function_csum.py python3 ./test.py -f functions/function_percentile2.py python3 ./test.py -f functions/variable_httpDbNameMandatory.py - - - ######## system-test #python3 ./test.py -f ../system-test/2-query/9-others/TD-11389.py # this case will run when this bug fix TD-11389 - - -#======================p5-end=============== - +#======================p5-end=============== \ No newline at end of file diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt index 9a8f602901507bc4fc31d3902461394446a3067b..6bbf5a24cf3ae2c50e8a30636962e815cd5b15c0 100644 --- a/tests/script/jenkins/basic.txt +++ b/tests/script/jenkins/basic.txt @@ -1,8 +1,6 @@ cd ../../../debug; cmake .. cd ../../../debug; make - #======================b1-start=============== - ./test.sh -f general/field/2.sim ./test.sh -f general/field/3.sim ./test.sh -f general/field/4.sim @@ -14,8 +12,6 @@ cd ../../../debug; make ./test.sh -f general/field/single.sim ./test.sh -f general/field/smallint.sim ./test.sh -f general/field/tinyint.sim - - # ./test.sh -f general/http/autocreate.sim # ./test.sh -f general/http/chunked.sim # ./test.sh -f general/http/gzip.sim @@ -27,7 +23,6 @@ cd ../../../debug; make # ./test.sh -f general/http/telegraf.sim # ./test.sh -f general/http/grafana_bug.sim # ./test.sh -f general/http/grafana.sim - ./test.sh -f general/insert/basic.sim ./test.sh -f general/insert/insert_drop.sim ./test.sh -f general/insert/query_block1_memory.sim @@ -37,7 +32,6 @@ cd ../../../debug; make ./test.sh -f general/insert/query_file_memory.sim ./test.sh -f general/insert/query_multi_file.sim ./test.sh -f general/insert/tcp.sim - ./test.sh -f general/parser/alter.sim ./test.sh -f general/parser/alter1.sim ./test.sh -f general/parser/alter_stable.sim @@ -90,30 +84,22 @@ cd ../../../debug; make ./test.sh -f general/db/nosuchfile.sim ./test.sh -f general/parser/function.sim ./test.sh -f unique/cluster/vgroup100.sim - # ./test.sh -f unique/http/admin.sim # ./test.sh -f unique/http/opentsdb.sim - ./test.sh -f unique/import/replica2.sim ./test.sh -f unique/import/replica3.sim - ./test.sh -f general/alter/cached_schema_after_alter.sim - #======================b1-end=============== #======================b2-start=============== - - #./test.sh -f general/wal/sync.sim ./test.sh -f general/wal/kill.sim ./test.sh -f general/wal/maxtables.sim - ./test.sh -f general/user/authority.sim ./test.sh -f general/user/monitor.sim ./test.sh -f general/user/pass_alter.sim ./test.sh -f general/user/pass_len.sim ./test.sh -f general/user/user_create.sim ./test.sh -f general/user/user_len.sim - ./test.sh -f general/vector/metrics_field.sim ./test.sh -f general/vector/metrics_mix.sim ./test.sh -f general/vector/metrics_query.sim @@ -125,7 +111,6 @@ cd ../../../debug; make ./test.sh -f general/vector/table_mix.sim ./test.sh -f general/vector/table_query.sim ./test.sh -f general/vector/table_time.sim - ./test.sh -f unique/account/account_create.sim ./test.sh -f unique/account/account_delete.sim ./test.sh -f unique/account/account_len.sim @@ -137,24 +122,17 @@ cd ../../../debug; make ./test.sh -f unique/account/usage.sim ./test.sh -f unique/account/user_create.sim ./test.sh -f unique/account/user_len.sim - ./test.sh -f unique/big/maxvnodes.sim ./test.sh -f unique/big/tcp.sim - ./test.sh -f unique/cluster/alter.sim ./test.sh -f unique/cluster/cache.sim #./test.sh -f unique/http/admin.sim #./test.sh -f unique/http/opentsdb.sim - ./test.sh -f unique/import/replica2.sim ./test.sh -f unique/import/replica3.sim - ./test.sh -f general/alter/cached_schema_after_alter.sim - - #======================b2-end=============== #======================b3-start=============== - ./test.sh -f unique/arbitrator/check_cluster_cfg_para.sim #./test.sh -f unique/arbitrator/dn2_mn1_cache_file_sync.sim ./test.sh -f unique/arbitrator/dn3_mn1_full_createTableFail.sim @@ -175,7 +153,6 @@ cd ../../../debug; make ./test.sh -f unique/arbitrator/dn3_mn1_r3_vnode_delDir.sim ./test.sh -f unique/arbitrator/dn3_mn1_vnode_nomaster.sim ./test.sh -f unique/arbitrator/dn3_mn2_killDnode.sim - ./test.sh -f unique/arbitrator/offline_replica2_alterTable_online.sim ./test.sh -f unique/arbitrator/offline_replica2_alterTag_online.sim ./test.sh -f unique/arbitrator/offline_replica2_createTable_online.sim @@ -189,19 +166,16 @@ cd ../../../debug; make ./test.sh -f unique/arbitrator/replica_changeWithArbitrator.sim ./test.sh -f unique/arbitrator/sync_replica2_alterTable_add.sim ./test.sh -f unique/arbitrator/sync_replica2_alterTable_drop.sim - ./test.sh -f unique/arbitrator/sync_replica2_dropDb.sim ./test.sh -f unique/arbitrator/sync_replica2_dropTable.sim ./test.sh -f unique/arbitrator/sync_replica3_alterTable_add.sim ./test.sh -f unique/arbitrator/sync_replica3_alterTable_drop.sim ./test.sh -f unique/arbitrator/sync_replica3_dropDb.sim ./test.sh -f unique/arbitrator/sync_replica3_dropTable.sim - ./test.sh -f unique/migrate/mn2_vn2_repl2_rmMnodeDir.sim ./test.sh -f unique/migrate/mn2_vn2_repl2_rmMnodeVnodeDir.sim ./test.sh -f unique/migrate/mn2_vn2_repl2_rmMnodeVnodeDir_stopAll_starAll.sim ./test.sh -f unique/migrate/mn2_vn2_repl2_rmVnodeDir.sim - ./test.sh -f unique/stable/balance_replica1.sim ./test.sh -f unique/stable/dnode2_stop.sim ./test.sh -f unique/stable/dnode2.sim @@ -210,11 +184,8 @@ cd ../../../debug; make ./test.sh -f unique/stable/replica2_vnode3.sim ./test.sh -f unique/stable/replica3_dnode6.sim ./test.sh -f unique/stable/replica3_vnode3.sim - #======================b3-end=============== #======================b4-start=============== - - ./test.sh -f general/alter/count.sim ./test.sh -f general/alter/dnode.sim ./test.sh -f general/alter/import.sim @@ -222,22 +193,17 @@ cd ../../../debug; make ./test.sh -f general/alter/insert2.sim ./test.sh -f general/alter/metrics.sim ./test.sh -f general/alter/table.sim - ./test.sh -f general/cache/new_metrics.sim ./test.sh -f general/cache/restart_metrics.sim ./test.sh -f general/cache/restart_table.sim - ./test.sh -f general/connection/connection.sim - ./test.sh -f general/column/commit.sim ./test.sh -f general/column/metrics.sim ./test.sh -f general/column/table.sim - ./test.sh -f general/compress/commitlog.sim ./test.sh -f general/compress/compress.sim ./test.sh -f general/compress/compress2.sim ./test.sh -f general/compress/uncompress.sim - ./test.sh -f general/stable/disk.sim ./test.sh -f general/stable/dnode3.sim ./test.sh -f general/stable/metrics.sim @@ -245,7 +211,6 @@ cd ../../../debug; make ./test.sh -f general/stable/show.sim ./test.sh -f general/stable/values.sim ./test.sh -f general/stable/vnode3.sim - ./test.sh -f unique/column/replica3.sim ./test.sh -f issue/TD-2713.sim ./test.sh -f general/parser/select_distinct_tag.sim @@ -253,10 +218,8 @@ cd ../../../debug; make ./test.sh -f issue/TD-2677.sim ./test.sh -f issue/TD-2680.sim ./test.sh -f unique/dnode/lossdata.sim - #======================b4-end=============== #======================b5-start=============== - ./test.sh -f unique/dnode/alternativeRole.sim ./test.sh -f unique/dnode/balance1.sim ./test.sh -f unique/dnode/balance2.sim @@ -264,7 +227,6 @@ cd ../../../debug; make ./test.sh -f unique/dnode/balancex.sim ./test.sh -f unique/dnode/offline1.sim ./test.sh -f unique/dnode/offline2.sim - ./test.sh -f general/stream/metrics_del.sim ./test.sh -f general/stream/metrics_replica1_vnoden.sim ./test.sh -f general/stream/restart_stream.sim @@ -272,22 +234,18 @@ cd ../../../debug; make ./test.sh -f general/stream/stream_restart.sim ./test.sh -f general/stream/table_del.sim ./test.sh -f general/stream/table_replica1_vnoden.sim - ./test.sh -f general/connection/test_old_data.sim ./test.sh -f unique/dnode/datatrans_3node.sim ./test.sh -f unique/dnode/datatrans_3node_2.sim ./test.sh -f general/db/alter_tables_d2.sim ./test.sh -f general/db/alter_tables_v1.sim ./test.sh -f general/db/alter_tables_v4.sim - #======================b5-end=============== #======================b6-start=============== - ./test.sh -f unique/dnode/reason.sim ./test.sh -f unique/dnode/remove1.sim ./test.sh -f unique/dnode/remove2.sim ./test.sh -f unique/dnode/vnode_clean.sim - ./test.sh -f unique/db/commit.sim ./test.sh -f unique/db/delete.sim ./test.sh -f unique/db/delete_part.sim @@ -298,14 +256,12 @@ cd ../../../debug; make ./test.sh -f unique/db/replica_reduce32.sim ./test.sh -f unique/db/replica_reduce31.sim ./test.sh -f unique/db/replica_part.sim - ./test.sh -f unique/vnode/many.sim ./test.sh -f unique/vnode/replica2_basic2.sim ./test.sh -f unique/vnode/replica2_repeat.sim ./test.sh -f unique/vnode/replica3_basic.sim ./test.sh -f unique/vnode/replica3_repeat.sim ./test.sh -f unique/vnode/replica3_vgroup.sim - ./test.sh -f unique/dnode/monitor.sim ./test.sh -f unique/dnode/monitor_bug.sim ./test.sh -f unique/dnode/simple.sim @@ -315,7 +271,6 @@ cd ../../../debug; make ./test.sh -f unique/dnode/offline3.sim ./test.sh -f general/wal/kill.sim ./test.sh -f general/wal/maxtables.sim - ./test.sh -f general/import/basic.sim ./test.sh -f general/import/commit.sim ./test.sh -f general/import/large.sim @@ -323,10 +278,8 @@ cd ../../../debug; make ./test.sh -f unique/cluster/balance1.sim ./test.sh -f unique/cluster/balance2.sim ./test.sh -f unique/cluster/balance3.sim - #======================b6-end=============== #======================b7-start=============== - ./test.sh -f general/compute/avg.sim ./test.sh -f general/compute/bottom.sim ./test.sh -f general/compute/count.sim @@ -343,7 +296,6 @@ cd ../../../debug; make ./test.sh -f general/compute/stddev.sim ./test.sh -f general/compute/sum.sim ./test.sh -f general/compute/top.sim - ./test.sh -f general/db/alter_option.sim ./test.sh -f general/db/alter_vgroups.sim ./test.sh -f general/db/basic.sim @@ -392,7 +344,6 @@ cd ../../../debug; make ./test.sh -f general/table/tinyint.sim ./test.sh -f general/table/vgroup.sim ./test.sh -f general/table/createmulti.sim - ./test.sh -f unique/mnode/mgmt20.sim ./test.sh -f unique/mnode/mgmt21.sim ./test.sh -f unique/mnode/mgmt22.sim @@ -403,7 +354,6 @@ cd ../../../debug; make ./test.sh -f unique/mnode/mgmt33.sim ./test.sh -f unique/mnode/mgmt34.sim ./test.sh -f unique/mnode/mgmtr2.sim - #./test.sh -f unique/arbitrator/insert_duplicationTs.sim ./test.sh -f general/parser/join_manyblocks.sim ./test.sh -f general/parser/stableOp.sim @@ -415,9 +365,7 @@ cd ../../../debug; make ./test.sh -f general/parser/last_cache.sim ./test.sh -f unique/big/balance.sim ./test.sh -f general/parser/nestquery.sim - ./test.sh -f general/parser/udf.sim ./test.sh -f general/parser/udf_dll.sim ./test.sh -f general/parser/udf_dll_stable.sim - -#======================b7-end=============== +#======================b7-end=============== \ No newline at end of file diff --git a/tests/test-CI.sh b/tests/test-CI.sh index c458be0aa184d6d0a3831554d4974a4b98662cfe..8537ec2a5448282cc7def6c26fd8a622b3189d71 100755 --- a/tests/test-CI.sh +++ b/tests/test-CI.sh @@ -51,7 +51,52 @@ function dohavecore(){ fi fi } +function runSimCaseOneByOnefq { + end=`sed -n '$=' jenkins/basic.txt` + for ((i=1;i<=$end;i++)) ; do + if [[ $(($i%$2)) -eq $4 ]];then + line=`sed -n "$i"p jenkins/basic.txt` + if [[ $line =~ ^./test.sh* ]] || [[ $line =~ ^run* ]]; then + case=`echo $line | grep sim$ |awk '{print $NF}'` + start_time=`date +%s` + date +%F\ %T | tee -a out.log + if [[ "$tests_dir" == *"$IN_TDINTERNAL"* ]]; then + echo -n $case + ./test.sh -f $case > case.log 2>&1 && \ + ( grep -q 'script.*'$case'.*failed.*, err.*lineNum' ../../../sim/tsim/log/taoslog0.0 && echo -e "${RED} failed${NC}" | tee -a out.log || echo -e "${GREEN} success${NC}" | tee -a out.log )|| \ + ( grep -q 'script.*success.*m$' ../../../sim/tsim/log/taoslog0.0 && echo -e "${GREEN} success${NC}" | tee -a out.log ) || \ + ( echo -e "${RED} failed${NC}" | tee -a out.log && echo '=====================log=====================' && cat case.log ) + else + echo -n $case + ./test.sh -f $case > ../../sim/case.log 2>&1 && \ + ( grep -q 'script.*'$case'.*failed.*, err.*lineNum' ../../sim/tsim/log/taoslog0.0 && echo -e "${RED} failed${NC}" | tee -a out.log || echo -e "${GREEN} success${NC}" | tee -a out.log )|| \ + ( grep -q 'script.*success.*m$' ../../sim/tsim/log/taoslog0.0 && echo -e "${GREEN} success${NC}" | tee -a out.log ) || \ + ( echo -e "${RED} failed${NC}" | tee -a out.log && echo '=====================log=====================' && cat case.log ) + fi + + out_log=`tail -1 out.log ` + if [[ $out_log =~ 'failed' ]];then + rm case.log + if [[ "$tests_dir" == *"$IN_TDINTERNAL"* ]]; then + cp -r ../../../sim ~/sim_`date "+%Y_%m_%d_%H:%M:%S"` + else + cp -r ../../sim ~/sim_`date "+%Y_%m_%d_%H:%M:%S" ` + fi + dohavecore $2 1 + if [[ $2 == 1 ]];then + exit 8 + fi + fi + end_time=`date +%s` + echo execution time of $case was `expr $end_time - $start_time`s. | tee -a out.log + dohavecore $2 1 + fi + fi + done + rm -rf ../../../sim/case.log + rm -rf ../../sim/case.log +} function runPyCaseOneByOne { while read -r line; do @@ -124,11 +169,9 @@ function runPyCaseOneByOnefq() { else echo $line if [[ $line =~ ^bash.* ]]; then - # $line > case.log 2>&1 || cat case.log && exit 8 - # cat case.log $line > case.log 2>&1 + cat case.log if [ $? -ne 0 ];then - cat case.log exit 8 fi fi @@ -175,7 +218,6 @@ if [ "${OS}" == "Linux" ]; then fi -echo "### run Python test case ###" cd $tests_dir @@ -206,8 +248,13 @@ if [ "$1" == "full" ]; then runPyCaseOneByOne fulltest-other.sh runPyCaseOneByOne fulltest-insert.sh runPyCaseOneByOne fulltest-connector.sh +elif [ "$1" == "sim" ]; then + echo "### run sim $2 test ###" + cd $tests_dir/script + runSimCaseOneByOnefq $2 1 $3 else echo "### run $1 $2 test ###" + if [ "$1" != "query" ] && [ "$1" != "taosAdapter" ] && [ "$1" != "other" ] && [ "$1" != "tools" ] && [ "$1" != "insert" ] && [ "$1" != "connector" ] ;then echo " wrong option:$1 must one of [query,other,tools,insert,connector,taosAdapter]" exit 8