提交 a9ff8c28 编写于 作者: T tangfangzhi

refactor: always build enterprise edition and taos-tool

上级 897aa85a
...@@ -34,16 +34,6 @@ def abort_previous(){ ...@@ -34,16 +34,6 @@ def abort_previous(){
} }
def pre_test(){ def pre_test(){
sh 'hostname' sh 'hostname'
sh '''
date
sudo rmtaos || echo "taosd has not installed"
'''
sh '''
killall -9 taosd ||echo "no taosd running"
killall -9 gdb || echo "no gdb running"
killall -9 python3.8 || echo "no python program running"
cd ${WKC}
'''
script { script {
if (env.CHANGE_TARGET == 'master') { if (env.CHANGE_TARGET == 'master') {
sh ''' sh '''
...@@ -106,16 +96,6 @@ def pre_test(){ ...@@ -106,16 +96,6 @@ def pre_test(){
cd ${WKC} cd ${WKC}
git submodule update --init --recursive git submodule update --init --recursive
''' '''
sh '''
cd ${WK}
export TZ=Asia/Harbin
date
rm -rf debug
mkdir debug
cd debug
cmake .. > /dev/null
make -j4> /dev/null
'''
sh ''' sh '''
cd ${WKPY} cd ${WKPY}
git reset --hard git reset --hard
...@@ -209,17 +189,6 @@ pipeline { ...@@ -209,17 +189,6 @@ pipeline {
timeout(time: 20, unit: 'MINUTES'){ timeout(time: 20, unit: 'MINUTES'){
pre_test() pre_test()
script { script {
if (env.CHANGE_URL =~ /\/TDengine\//) {
sh '''
cd ${WKC}/tests/parallel_test
date
time ./container_build.sh -w ${WKDIR} -t 8
rm -f /tmp/cases.task
./collect_cases.sh
date
time ./run.sh -m /home/m.json -t /tmp/cases.task -b ${CHANGE_TARGET} -l ${WKDIR}/log
'''
} else if (env.CHANGE_URL =~ /\/TDinternal\//) {
sh ''' sh '''
cd ${WKC}/tests/parallel_test cd ${WKC}/tests/parallel_test
date date
...@@ -229,11 +198,6 @@ pipeline { ...@@ -229,11 +198,6 @@ pipeline {
date date
time ./run.sh -e -m /home/m.json -t /tmp/cases.task -b ${CHANGE_TARGET} -l ${WKDIR}/log time ./run.sh -e -m /home/m.json -t /tmp/cases.task -b ${CHANGE_TARGET} -l ${WKDIR}/log
''' '''
} else {
sh '''
echo "unmatched reposiotry ${CHANGE_URL}"
'''
}
} }
} }
} }
......
...@@ -52,7 +52,7 @@ fi ...@@ -52,7 +52,7 @@ fi
docker run \ docker run \
-v $REP_MOUNT_PARAM \ -v $REP_MOUNT_PARAM \
--rm --ulimit core=-1 taos_test:v1.0 sh -c "cd $REP_DIR;rm -rf debug;mkdir -p debug;cd debug;cmake ..;make -j $THREAD_COUNT" --rm --ulimit core=-1 taos_test:v1.0 sh -c "cd $REP_DIR;rm -rf debug;mkdir -p debug;cd debug;cmake .. -DBUILD_TOOLS=true;make -j $THREAD_COUNT"
ret=$? ret=$?
exit $ret exit $ret
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册