diff --git a/Jenkinsfile b/Jenkinsfile index 5a8f6a551ea3355c094218b4857e99c81a331eb3..c262aa50f7970cf637c73595917d0fbc3df827b4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -29,6 +29,31 @@ pipeline { stage('Parallel test stage') { parallel { + stage('pytest') { + agent{label 'master'} + steps { + sh ''' + date + cd ${WKC} + git checkout develop + git pull + git submodule update + cd ${WK} + git checkout develop + git pull + export TZ=Asia/Harbin + date + rm -rf ${WK}/debug + mkdir debug + cd debug + cmake .. > /dev/null + make > /dev/null + cd ${WKC}/tests + #./test-all.sh smoke + ./test-all.sh pytest + date''' + } + } stage('test_b1') { agent{label '184'} steps { @@ -118,4 +143,5 @@ pipeline { } } -} + +} \ No newline at end of file diff --git a/tests/pytest/handle_val_log.sh b/tests/pytest/handle_val_log.sh old mode 100644 new mode 100755 diff --git a/tests/test-all.sh b/tests/test-all.sh index 983ef5ffecf36b1587354fa60d15e3004010459e..e45dd15fedc999c08037544254f13f78607ee638 100755 --- a/tests/test-all.sh +++ b/tests/test-all.sh @@ -121,7 +121,7 @@ if [ "$2" != "sim" ]; then elif [ "$1" == "full" ]; then echo "### run Python full test ###" runPyCaseOneByOne fulltest.sh - elif [ "$1" == "b1" ]; then + elif [ "$1" == "pytest" ]; then echo "### run Python full test ###" runPyCaseOneByOne fulltest.sh elif [ "$1" == "b2" ] || [ "$1" == "b3" ]; then