diff --git a/Jenkinsfile b/Jenkinsfile index 70a55eba0fa43ea172230ce4bfaddd4f1fce34ca..644db4aeaf7141dc10b7340d3565d65cc5820ff1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -406,7 +406,7 @@ pipeline { sh """ date cd ${WKC}/tests - ./test-CI.sh ${it} p1 + ./test-CI.sh ${it} 5 1 date""" } } @@ -423,7 +423,7 @@ pipeline { sh """ date cd ${WKC}/tests - ./test-CI.sh ${it} p2 + ./test-CI.sh ${it} 5 2 date""" } } @@ -440,7 +440,7 @@ pipeline { sh """ date cd ${WKC}/tests - ./test-CI.sh ${it} p3 + ./test-CI.sh ${it} 5 3 date""" } } @@ -457,7 +457,7 @@ pipeline { sh """ date cd ${WKC}/tests - ./test-CI.sh ${it} p4 + ./test-CI.sh ${it} 5 4 date""" } } @@ -475,7 +475,7 @@ pipeline { sh """ date cd ${WKC}/tests - ./test-CI.sh ${it} p5 + ./test-CI.sh ${it} 5 5 date""" } } diff --git a/tests/test-CI.sh b/tests/test-CI.sh index 731cc3c3672365624b762d6e7231267026637a38..720b0aeb4ef6eac79312c38d8d9ab8b2f25498de 100755 --- a/tests/test-CI.sh +++ b/tests/test-CI.sh @@ -83,10 +83,9 @@ function runPyCaseOneByOne { } function runPyCaseOneByOnefq() { - start=`sed -n "/$2-start/=" $1` - end=`sed -n "/$2-end/=" $1` - - for ((i=$start;i<=$end;i++)) ; do + end=`sed -n '$=' $1` + for ((i=1;i<=$end;i++)) ; do + if [[ $(($i%$2)) -eq $4 ]];then line=`sed -n "$i"p $1` if [[ $line =~ ^python.* ]]; then if [[ $line != *sleep* ]]; then @@ -123,6 +122,7 @@ function runPyCaseOneByOnefq() { fi dohavecore $3 2 fi + fi done rm -rf ../../sim/case.log } @@ -198,10 +198,15 @@ if [ "$1" == "full" ]; then else echo "### run $1 $2 test ###" if [ "$1" != "query" ] && [ "$1" != "other" ] && [ "$1" != "tools" ] && [ "$1" != "insert" ] && [ "$1" != "connector" ] ;then - echo " wrong option:$1 must one of [queyr,other,tools,insert,connector]" + echo " wrong option:$1 must one of [query,other,tools,insert,connector]" exit 8 fi - runPyCaseOneByOnefq fulltest-$1.sh $2 1 + cd $tests_dir/pytest + runPyCaseOneByOnefq fulltest-$1.sh $2 1 $3 + cd $tests_dir/develop-test + runPyCaseOneByOnefq fulltest-$1.sh $2 1 $3 + cd $tests_dir/system-test + runPyCaseOneByOnefq fulltest-$1.sh $2 1 $3 fi totalPySuccess=`grep 'success' pytest-out.log | wc -l`