[TD-10778]add win test in jenkins

349bf03c · liuyq-617 · c4893060 · 349bf03c
隐藏空白更改
内联并排

Showing with 30 addition and 30 deletion

Jenkinsfile Jenkinsfile +30 -30

未找到文件。
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -179,9 +179,9 @@ def pre_test_win(){
    git clean -dfx
    mkdir debug
    cd debug
-    call "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\vcvarsall.bat" amd64
+    call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build\\vcvarsall.bat" amd64
    cmake ../ -G "NMake Makefiles" 
-    nmake || exit 8
+    set CL=/MP nmake nmake || exit 8
    nmake install || exit 8
    xcopy /e/y/i/f C:\\workspace\\TDinternal\\debug\\build\\lib\\taos.dll C:\\Windows\\System32 || exit 8
    cd C:\\workspace\\TDinternal\\community\\src\\connector\\python
@@ -470,35 +470,35 @@ pipeline {
          }
        } 
-        // stage('build'){
+        stage('build'){
-        //   agent{label " wintest "}
+          agent{label " wintest "}
-        //   steps {
+          steps {
-        //     pre_test()
+            pre_test()
-        //     script{             
+            script{             
-        //         while(win_stop == 0){
+                while(win_stop == 0){
-        //           sleep(1)
+                  sleep(1)
-        //           }
+                  }
-        //       }
+              }
-        //     }
+            }
-        // }
+        }
-        // stage('test'){
+        stage('test'){
-        //   agent{label "win"}
+          agent{label "win"}
-        //   steps{
+          steps{
-        //     catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
+            catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
-        //         pre_test_win()
+                pre_test_win()
-        //         timeout(time: 20, unit: 'MINUTES'){
+                timeout(time: 20, unit: 'MINUTES'){
-        //         bat'''
+                bat'''
-        //         cd C:\\workspace\\TDinternal\\community\\tests\\pytest
+                cd C:\\workspace\\TDinternal\\community\\tests\\pytest
-        //         .\\test-all.bat Wintest
+                .\\test-all.bat wintest
-        //         '''
+                '''
-        //         }
+                }
-        //     }     
+            }     
-        //     script{
+            script{
-        //       win_stop=1
+              win_stop=1
-        //     }
+            }
-        //   }
+          }
-        // }
+        }
    }