Merge remote-tracking branch 'origin/3.0' into fix/tsim
This commit is contained in:
commit
59aed5f8a1
20
Jenkinsfile2
20
Jenkinsfile2
|
@ -88,6 +88,12 @@ def pre_test(){
|
||||||
cmake .. > /dev/null
|
cmake .. > /dev/null
|
||||||
make -j4> /dev/null
|
make -j4> /dev/null
|
||||||
'''
|
'''
|
||||||
|
sh'''
|
||||||
|
cd ${WKPY}
|
||||||
|
git reset --hard
|
||||||
|
git pull
|
||||||
|
pip3 install .
|
||||||
|
'''
|
||||||
return 1
|
return 1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -97,6 +103,7 @@ pipeline {
|
||||||
environment{
|
environment{
|
||||||
WK = '/var/lib/jenkins/workspace/TDinternal'
|
WK = '/var/lib/jenkins/workspace/TDinternal'
|
||||||
WKC= '/var/lib/jenkins/workspace/TDengine'
|
WKC= '/var/lib/jenkins/workspace/TDengine'
|
||||||
|
WKPY= '/var/lib/jenkins/workspace/taos-connector-python'
|
||||||
}
|
}
|
||||||
stages {
|
stages {
|
||||||
stage('pre_build'){
|
stage('pre_build'){
|
||||||
|
@ -113,13 +120,18 @@ pipeline {
|
||||||
timeout(time: 45, unit: 'MINUTES'){
|
timeout(time: 45, unit: 'MINUTES'){
|
||||||
pre_test()
|
pre_test()
|
||||||
sh'''
|
sh'''
|
||||||
cd ${WKC}/tests
|
|
||||||
./test-all.sh b1fq
|
|
||||||
'''
|
|
||||||
sh'''
|
|
||||||
cd ${WKC}/debug
|
cd ${WKC}/debug
|
||||||
ctest
|
ctest
|
||||||
'''
|
'''
|
||||||
|
sh'''
|
||||||
|
export LD_LIBRARY_PATH=${WKC}/debug/build/lib
|
||||||
|
cd ${WKC}/tests/system-test
|
||||||
|
./fulltest.sh
|
||||||
|
'''
|
||||||
|
sh'''
|
||||||
|
cd ${WKC}/tests
|
||||||
|
./test-all.sh b1fq
|
||||||
|
'''
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -346,7 +346,7 @@ int32_t qwRegisterHbBrokenLinkArg(SQWorkerMgmt *mgmt, uint64_t sId, SQWConnInfo
|
||||||
.refId = pConn->refId,
|
.refId = pConn->refId,
|
||||||
.msgType = TDMT_VND_QUERY_HEARTBEAT,
|
.msgType = TDMT_VND_QUERY_HEARTBEAT,
|
||||||
.pCont = msg,
|
.pCont = msg,
|
||||||
.contLen = sizeof(SSchedulerHbReq),
|
.contLen = msgSize,
|
||||||
.code = TSDB_CODE_RPC_NETWORK_UNAVAIL,
|
.code = TSDB_CODE_RPC_NETWORK_UNAVAIL,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue