From a9ff8c28fa070579197b2077cf6232ac0672bfc2 Mon Sep 17 00:00:00 2001
From: tangfangzhi <fztang@taosdata.com>
Date: Wed, 11 May 2022 19:35:49 +0800
Subject: [PATCH] refactor: always build enterprise edition and taos-tool

---
 Jenkinsfile2                           | 54 +++++---------------------
 tests/parallel_test/container_build.sh |  2 +-
 2 files changed, 10 insertions(+), 46 deletions(-)

diff --git a/Jenkinsfile2 b/Jenkinsfile2
index a86a2535aa..7377e33c1e 100644
--- a/Jenkinsfile2
+++ b/Jenkinsfile2
@@ -34,16 +34,6 @@ def abort_previous(){
 }
 def pre_test(){
     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 {
         if (env.CHANGE_TARGET == 'master') {
             sh '''
@@ -106,16 +96,6 @@ def pre_test(){
         cd ${WKC}
         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 '''
         cd ${WKPY}
         git reset --hard
@@ -209,31 +189,15 @@ pipeline {
                         timeout(time: 20, unit: 'MINUTES'){
                             pre_test()
                             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 '''
-                                        cd ${WKC}/tests/parallel_test
-                                        date
-                                        time ./container_build.sh -w ${WKDIR} -t 8 -e
-                                        rm -f /tmp/cases.task
-                                        ./collect_cases.sh -e
-                                        date
-                                        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}"
-                                    '''
-                                }
+                                sh '''
+                                    cd ${WKC}/tests/parallel_test
+                                    date
+                                    time ./container_build.sh -w ${WKDIR} -t 8 -e
+                                    rm -f /tmp/cases.task
+                                    ./collect_cases.sh -e
+                                    date
+                                    time ./run.sh -e -m /home/m.json -t /tmp/cases.task -b ${CHANGE_TARGET} -l ${WKDIR}/log
+                                '''
                             }
                         }
                     }
diff --git a/tests/parallel_test/container_build.sh b/tests/parallel_test/container_build.sh
index c1571bf279..3f23cd8b5f 100755
--- a/tests/parallel_test/container_build.sh
+++ b/tests/parallel_test/container_build.sh
@@ -52,7 +52,7 @@ fi
 
 docker run \
     -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=$?
 exit $ret