From 53f53fe9c9275b36f1ef60bd6f5bd568bebb83cb Mon Sep 17 00:00:00 2001
From: tangfangzhi <fztang@taosdata.com>
Date: Thu, 2 Jun 2022 13:55:14 +0800
Subject: [PATCH] fix: copy taos.dll to system32

---
 Jenkinsfile2 | 44 ++++++++++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/Jenkinsfile2 b/Jenkinsfile2
index 1226462570..d272eb9de7 100644
--- a/Jenkinsfile2
+++ b/Jenkinsfile2
@@ -261,6 +261,7 @@ def pre_test_build_win() {
     bat '''
         cd C:\\workspace\\%EXECUTOR_NUMBER%\\taos-connector-python
         python -m pip install .
+        xcopy /e/y/i/f C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\debug\\build\\lib\\taos.dll C:\\Windows\\System32
     '''
     return 1
 }
@@ -277,6 +278,8 @@ def run_win_test() {
     echo "LINUX NODE: ${linux_node_ip} - ${linux_node_pass}"
     bat '''
         echo "windows test ..."
+        cd C:\\workspace\\%EXECUTOR_NUMBER%\\taos-connector-python
+        python -m pip install .
         time /t
         cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\community\\tests\\system-test
         echo "testing ..."
@@ -335,6 +338,25 @@ pipeline {
                                 returnStdout: true
                             ).trim()
                         }
+                        catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
+                            timeout(time: 40, unit: 'MINUTES'){
+                                script {
+                                    sh '''
+                                        date
+                                        rm -rf ${WKC}/debug
+                                        time ./container_build.sh -w ${WKDIR} -t 8 -e
+                                        rm -f /tmp/cases.task
+                                        ./collect_cases.sh -e
+                                    '''
+                                    sh '''
+                                        cd ${WKC}/tests/parallel_test
+                                        export DEFAULT_RETRY_TIME=2
+                                        date
+                                        timeout 2100 time ./run.sh -e -m /home/m.json -t /tmp/cases.task -b ${BRANCH_NAME}_${BUILD_ID} -l ${WKDIR}/log -o 480
+                                    '''
+                                }
+                            }
+                        }
                         catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
                             timeout(time: 15, unit: 'MINUTES'){
                                 pre_test()
@@ -354,14 +376,12 @@ pipeline {
                                         service taosd start
                                         sleep 20
                                         service taosd status
-                                        rm -rf ${WKC}/debug
+                                        rm -rf ${WK}/debug
+                                        mv ${WKC}/debug ${WK}/
                                     '''
                                     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
+                                        cd ${WKPY}
+                                        pip3 install .
                                     '''
                                 }
                             }
@@ -369,18 +389,6 @@ pipeline {
                         script {
                             linux_ready = 1
                         }
-                        catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
-                            timeout(time: 40, unit: 'MINUTES'){
-                                script {
-                                    sh '''
-                                        cd ${WKC}/tests/parallel_test
-                                        export DEFAULT_RETRY_TIME=2
-                                        date
-                                        timeout 2100 time ./run.sh -e -m /home/m.json -t /tmp/cases.task -b ${BRANCH_NAME}_${BUILD_ID} -l ${WKDIR}/log -o 480
-                                    '''
-                                }
-                            }
-                        }
                         script {
                             while(win_test_stage == 0){
                                 sleep(12)