From 891978882a3a171b08315684a592a71b22b87487 Mon Sep 17 00:00:00 2001
From: Yiqing Liu <yqliu@taosdata.com>
Date: Wed, 4 Aug 2021 18:18:34 +0800
Subject: [PATCH] [TD-5783]<CI>add test for 2.0 branch (#7153)

* [TD-5783]<CI>add test for 2.0 branch

* fix

* fix
---
 .drone.yml  |  8 ++++++++
 Jenkinsfile | 56 ++++++++++++++++++++++++++++++++++-------------------
 2 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index f7ee4e976f..3f6c622598 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -23,6 +23,7 @@ steps:
     branch:
     - develop
     - master
+    - 2.0
 ---
 kind: pipeline
 name: test_arm64
@@ -48,6 +49,7 @@ steps:
     branch:
     - develop
     - master
+    - 2.0
 ---
 kind: pipeline
 name: test_arm
@@ -73,6 +75,7 @@ steps:
     branch:
     - develop
     - master
+    - 2.0
 
 ---
 kind: pipeline
@@ -100,6 +103,7 @@ steps:
     branch:
     - develop
     - master
+    - 2.0
 ---
 kind: pipeline
 name: build_xenial
@@ -125,6 +129,7 @@ steps:
     branch:
     - develop
     - master
+    - 2.0
 
 ---
 kind: pipeline
@@ -150,6 +155,7 @@ steps:
     branch:
     - develop
     - master
+    - 2.0
 ---
 kind: pipeline
 name: build_centos7
@@ -173,6 +179,7 @@ steps:
     branch:
     - develop
     - master
+    - 2.0
 
 ---
 kind: pipeline
@@ -191,6 +198,7 @@ steps:
     branch:
     - develop
     - master
+    - 2.0
 
 
 depends_on:
diff --git a/Jenkinsfile b/Jenkinsfile
index d685df3d0c..4838850722 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -41,6 +41,7 @@ def pre_test(){
     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}
     git reset --hard HEAD~10 >/dev/null
     '''
@@ -51,12 +52,18 @@ def pre_test(){
         git checkout master
         '''
         }
-      else {
+      else if(env.CHANGE_TARGET == '2.0'){
+        sh '''
+        cd ${WKC}
+        git checkout 2.0
+        '''
+      } 
+      else{
         sh '''
         cd ${WKC}
         git checkout develop
         '''
-      } 
+      }
     }
     sh'''
     cd ${WKC}
@@ -74,7 +81,13 @@ def pre_test(){
         git checkout master
         '''
         }
-      else {
+      else if(env.CHANGE_TARGET == '2.0'){
+        sh '''
+        cd ${WK}
+        git checkout 2.0
+        '''
+      } 
+      else{
         sh '''
         cd ${WK}
         git checkout develop
@@ -223,24 +236,27 @@ pipeline {
           steps {
             pre_test()
             catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                sh '''
-                cd ${WKC}/tests/pytest
-                ./crash_gen.sh -a -p -t 4 -s 2000
-                '''
+                timeout(time: 60, unit: 'MINUTES'){
+                  sh '''
+                  cd ${WKC}/tests/pytest
+                  ./crash_gen.sh -a -p -t 4 -s 2000
+                  '''
+                }
+            }
+            timeout(time: 60, unit: 'MINUTES'){
+              sh '''
+              cd ${WKC}/tests/pytest
+              rm -rf /var/lib/taos/*
+              rm -rf /var/log/taos/*
+              ./handle_crash_gen_val_log.sh
+              '''
+              sh '''
+              cd ${WKC}/tests/pytest
+              rm -rf /var/lib/taos/*
+              rm -rf /var/log/taos/*
+              ./handle_taosd_val_log.sh
+              '''
             }
-
-            sh '''
-            cd ${WKC}/tests/pytest
-            rm -rf /var/lib/taos/*
-            rm -rf /var/log/taos/*
-            ./handle_crash_gen_val_log.sh
-            '''
-            sh '''
-            cd ${WKC}/tests/pytest
-            rm -rf /var/lib/taos/*
-            rm -rf /var/log/taos/*
-            ./handle_taosd_val_log.sh
-            '''
             timeout(time: 45, unit: 'MINUTES'){
                 sh '''
                 date