Merge pull request #3867 from taosdata/hotfix/test

[TD-1676]balance jenkins server
This commit is contained in:
Shengliang Guan 2020-10-15 12:11:30 +08:00 committed by GitHub
commit abcc9c7267
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 2 deletions

28
Jenkinsfile vendored
View File

@ -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 {
}
}
}
}

0
tests/pytest/handle_val_log.sh Normal file → Executable file
View File

View File

@ -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