diff --git a/Jenkinsfile b/Jenkinsfile index 4410d81be6974fc246f50044cbc142076212677b..8a380c46df422b54e87f29bc1052a239b8ec50ae 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,13 +4,35 @@ pipeline { WK = '/var/lib/jenkins/workspace/TDinternal' WKC= '/var/lib/jenkins/workspace/TDinternal/community' } + stages { + stage('pre build'){ + agent{label 'master'} + steps{ + sh ''' + cd ${WKC} + td=`git diff develop remotes/origin/develop` + if [ ! $td ];then + echo "no changes,skip build" + exit 0 + fi + echo "check OK!" + ''' + } + } stage('Parallel test stage') { parallel { stage('pytest') { agent{label 'master'} steps { sh ''' + cd ${WKC} + td=`git diff develop remotes/origin/develop` + if [ ! $td ];then + echo "no changes,skip build" + exit 0 + fi + date cd ${WKC} git checkout develop @@ -36,6 +58,12 @@ pipeline { agent{label '184'} steps { sh ''' + cd ${WKC} + td=`git diff develop remotes/origin/develop` + if [ ! $td ];then + echo "no changes,skip build" + exit 0 + fi date cd ${WKC} git checkout develop @@ -62,7 +90,12 @@ pipeline { agent{label "185"} steps { sh ''' - + cd ${WKC} + td=`git diff develop remotes/origin/develop` + if [ ! $td ];then + echo "no changes,skip build" + exit 0 + fi cd ${WKC} git checkout develop git pull @@ -91,6 +124,12 @@ pipeline { agent{label "186"} steps { sh ''' + cd ${WKC} + td=`git diff develop remotes/origin/develop` + if [ ! $td ];then + echo "no changes,skip build" + exit 0 + fi date cd ${WKC} git checkout develop diff --git a/tests/script/jenkins/basic_1.txt b/tests/script/jenkins/basic_1.txt index aba2ec945f518b473854eaec23f22fbca51d7192..765e7139163952c43569e596d8ca8cf27d583cf6 100644 --- a/tests/script/jenkins/basic_1.txt +++ b/tests/script/jenkins/basic_1.txt @@ -199,4 +199,7 @@ ./test.sh -f unique/dnode/vnode_clean.sim ./test.sh -f unique/http/admin.sim -./test.sh -f unique/http/opentsdb.sim \ No newline at end of file +./test.sh -f unique/http/opentsdb.sim + +./test.sh -f unique/import/replica2.sim +./test.sh -f unique/import/replica3.sim diff --git a/tests/script/jenkins/basic_2.txt b/tests/script/jenkins/basic_2.txt index 166c732df79197173827af08ec36495dd11cde47..014313fafe9c7974baa7205cca41492dedee213a 100644 --- a/tests/script/jenkins/basic_2.txt +++ b/tests/script/jenkins/basic_2.txt @@ -81,3 +81,10 @@ 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 \ No newline at end of file diff --git a/tests/script/jenkins/basic_3.txt b/tests/script/jenkins/basic_3.txt index de5d64b98464d90fafd02c0efe28d444716c8cbd..83b10a371cbc354acc079a6307fe0dbee27e3533 100644 --- a/tests/script/jenkins/basic_3.txt +++ b/tests/script/jenkins/basic_3.txt @@ -1,5 +1,3 @@ -./test.sh -f unique/import/replica2.sim -./test.sh -f unique/import/replica3.sim ./test.sh -f unique/stable/balance_replica1.sim ./test.sh -f unique/stable/dnode2_stop.sim @@ -21,12 +19,7 @@ ./test.sh -f unique/mnode/mgmt34.sim ./test.sh -f unique/mnode/mgmtr2.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 general/parser/stream_on_sys.sim ./test.sh -f general/stream/metrics_del.sim