xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #1981 from taosdata/hotfix/change-xenial-to-bionic-in-ci 

change xenial to bionic for using python3.6 and fix pytest script.
This commit is contained in:
Shengliang Guan 2020-05-21 15:22:00 +08:00 committed by GitHub
parent 26ff796663 14f4e72175
commit 4aff58e83f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -90,6 +90,7 @@ matrix:
esac esac
- os: linux - os: linux
dist: bionic
language: c language: c
compiler: gcc compiler: gcc
env: COVERITY_SCAN=true env: COVERITY_SCAN=true
@ -125,6 +126,7 @@ matrix:
branch_pattern: coverity_scan branch_pattern: coverity_scan
- os: linux - os: linux
dist: bionic
language: c language: c
compiler: gcc compiler: gcc
env: ENV_COVER=true env: ENV_COVER=true
@ -230,6 +232,7 @@ matrix:
- make > /dev/null - make > /dev/null
- os: linux - os: linux
dist: bionic
language: c language: c
compiler: clang compiler: clang
env: DESC="linux/clang build" env: DESC="linux/clang build"

4
tests/test-all.sh
View File

@ -33,9 +33,9 @@ echo "### run Python script ###"
cd ../pytest cd ../pytest
if [ "$1" == "cron" ]; then if [ "$1" == "cron" ]; then
./fulltest.sh > /dev/null | tee pytest-out.txt ./fulltest.sh 2>&1 | grep 'successfully executed\|failed\|fault' | grep -v 'default'| tee pytest-out.txt
else else
./smoketest.sh > /dev/null | tee pytest-out.txt ./smoketest.sh 2>&1 | grep 'successfully executed\|failed\|fault' | grep -v 'default'| tee pytest-out.txt
fi fi
totalPySuccess=`grep 'successfully executed' pytest-out.txt | wc -l` totalPySuccess=`grep 'successfully executed' pytest-out.txt | wc -l`