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:
commit
4aff58e83f
|
@ -90,6 +90,7 @@ matrix:
|
|||
esac
|
||||
|
||||
- os: linux
|
||||
dist: bionic
|
||||
language: c
|
||||
compiler: gcc
|
||||
env: COVERITY_SCAN=true
|
||||
|
@ -125,6 +126,7 @@ matrix:
|
|||
branch_pattern: coverity_scan
|
||||
|
||||
- os: linux
|
||||
dist: bionic
|
||||
language: c
|
||||
compiler: gcc
|
||||
env: ENV_COVER=true
|
||||
|
@ -230,6 +232,7 @@ matrix:
|
|||
- make > /dev/null
|
||||
|
||||
- os: linux
|
||||
dist: bionic
|
||||
language: c
|
||||
compiler: clang
|
||||
env: DESC="linux/clang build"
|
||||
|
|
|
@ -33,9 +33,9 @@ echo "### run Python script ###"
|
|||
cd ../pytest
|
||||
|
||||
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
|
||||
./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
|
||||
totalPySuccess=`grep 'successfully executed' pytest-out.txt | wc -l`
|
||||
|
||||
|
|
Loading…
Reference in New Issue