From 9887661062b4cfd62c999dc6107611992c586e97 Mon Sep 17 00:00:00 2001
From: liuyq-617 <yqliu@taosdata.com>
Date: Fri, 24 Sep 2021 11:27:03 +0000
Subject: [PATCH] update jenkins

---
 Jenkinsfile | 76 +++++++++++++++++++++++++----------------------------
 1 file changed, 36 insertions(+), 40 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index eb1f1fb6b5..88e0cd4cf1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -41,84 +41,80 @@ def pre_test(){
     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}
+    cd ${WORKSPACE}
     git reset --hard HEAD~10 >/dev/null
     '''
     script {
       if (env.CHANGE_TARGET == 'master') {
         sh '''
-        cd ${WKC}
+        cd ${WORKSPACE}
         git checkout master
         '''
         }
       else if(env.CHANGE_TARGET == '2.0'){
         sh '''
-        cd ${WKC}
+        cd ${WORKSPACE}
         git checkout 2.0
         '''
       }
       else if(env.CHANGE_TARGET == '3.0'){
         sh '''
-        cd ${WKC}
+        cd ${WORKSPACE}
         git checkout 3.0
         '''
       } 
       else{
         sh '''
-        cd ${WKC}
+        cd ${WORKSPACE}
         git checkout develop
         '''
       }
     }
     sh'''
-    cd ${WKC}
+    cd ${WORKSPACE}
     git pull >/dev/null
     git fetch origin +refs/pull/${CHANGE_ID}/merge
     git checkout -qf FETCH_HEAD
     git clean -dfx
-    cd ${WK}
-    git reset --hard HEAD~10
     '''
-    script {
-      if (env.CHANGE_TARGET == 'master') {
-        sh '''
-        cd ${WK}
-        git checkout master
-        '''
-        }
-      else if(env.CHANGE_TARGET == '2.0'){
-        sh '''
-        cd ${WK}
-        git checkout 2.0
-        '''
-      } 
-      else if(env.CHANGE_TARGET == '3.0'){
-        sh '''
-        cd ${WK}
-        git checkout 3.0
-        '''
-      } 
-      else{
-        sh '''
-        cd ${WK}
-        git checkout develop
-        '''
-      } 
-    }
+    // script {
+    //   if (env.CHANGE_TARGET == 'master') {
+    //     sh '''
+    //     cd ${WK}
+    //     git checkout master
+    //     '''
+    //     }
+    //   else if(env.CHANGE_TARGET == '2.0'){
+    //     sh '''
+    //     cd ${WK}
+    //     git checkout 2.0
+    //     '''
+    //   } 
+    //   else if(env.CHANGE_TARGET == '3.0'){
+    //     sh '''
+    //     cd ${WK}
+    //     git checkout 3.0
+    //     '''
+    //   } 
+    //   else{
+    //     sh '''
+    //     cd ${WK}
+    //     git checkout develop
+    //     '''
+    //   } 
+    // }
+    // sh '''
+    // cd ${WK}
+    // git pull >/dev/null 
     sh '''
-    cd ${WK}
-    git pull >/dev/null 
-
     export TZ=Asia/Harbin
     date
-    git clean -dfx
     mkdir debug
     cd debug
     cmake .. > /dev/null
     make > /dev/null
     make install > /dev/null
-    cd ${WKC}/tests
-    pip3 install ${WKC}/src/connector/python/
+
     '''
     return 1
 }
-- 
GitLab