From b24aeae61967c15334a9aff0712315f378d32699 Mon Sep 17 00:00:00 2001
From: liuyq-617 <yqliu@taosdata.com>
Date: Wed, 15 Sep 2021 15:11:45 +0800
Subject: [PATCH] update jenkins

---
 Jenkinsfile               | 7 ++++---
 tests/pytest/test-all.bat | 1 -
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 5f1311d943..b52c34628c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -144,7 +144,7 @@ def pre_test_win(){
     bat'''
     cd C:\\workspace\\TDinternal\\community
     git pull 
-    git fetch origin +refs/pull/${CHANGE_ID}/merge
+    git fetch origin +refs/pull/%CHANGE_ID%/merge
     git checkout -qf FETCH_HEAD
     git clean -dfx
     cd C:\\workspace\\TDinternal
@@ -182,9 +182,10 @@ def pre_test_win(){
     cmake ../ -G "NMake Makefiles" 
     nmake
     nmake install 
+    xcopy /e/y/i/f C:\\workspace\\TDinternal\\debug\\build\\lib\\taos.dll C:\\Windows\\System32
     cd C:\\workspace\\TDinternal\\community\\src\\connector\\python
     python -m pip install .
-    xcopy /e/y/i/f C:\\workspace\\TDinternal\\debug\\build\\lib\\taos.dll C:\\Windows\\System32
+    
     '''
     return 1
 }
@@ -467,7 +468,7 @@ pipeline {
             catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
                 bat'''
                 cd C:\\workspace\\TDinternal\\community\\tests\\pytest
-                test-all.bat Wintest
+                .\\test-all.bat Wintest
                 '''
             }     
             script{
diff --git a/tests/pytest/test-all.bat b/tests/pytest/test-all.bat
index 1f1e2c1727..31c69e9c95 100644
--- a/tests/pytest/test-all.bat
+++ b/tests/pytest/test-all.bat
@@ -7,7 +7,6 @@ for /F "usebackq tokens=*" %%i in (fulltest.bat) do (
     if errorlevel 1 ( call :colorEcho 0c "failed" &echo. && exit 8 ) else ( call :colorEcho 0a "Success" &echo. )   
 )
 exit
-
 :colorEcho
 echo off
 <nul set /p ".=%DEL%" > "%~2"
-- 
GitLab