[TD-2493]<test>fix email error

6d34da39 · liuyq-617 · 27fa9419 · 6d34da39
隐藏空白更改
内联并排

Showing with 26 addition and 8 deletion

Jenkinsfile Jenkinsfile +26 -8

未找到文件。
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -31,6 +31,7 @@ def abort_previous(){
  if (buildNumber > 1) milestone(buildNumber - 1)
  milestone(buildNumber)
 }
+def kipstage=0
 def pre_test(){
    catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
                sh '''
@@ -72,12 +73,29 @@ pipeline {
  }
  
  stages {
-      
+      stage('pre_build'){
+          agent{label 'master'}
+          steps {
+          sh'''
+          cd ${WORKSPACE}
+          git checkout develop
+          git pull
+          git fetch origin +refs/pull/${CHANGE_ID}/merge
+          git checkout -qf FETCH_HEAD
+          '''
+          script{
+            skipstage=sh(script:"git --no-pager diff --name-only FETCH_HEAD develop|grep -v -E '.*md|//src//connector|Jenkinsfile|test-all.sh' || echo 1 ",returnStdout:true) 
+          }
+          }
+      }
    
      stage('Parallel test stage') {
        //only build pr
        when {
              changeRequest()
+              expression {
+                    skipstage == 0
+              }
          }
      parallel {
        stage('python_1_s1') {
@@ -127,7 +145,7 @@ pipeline {
        stage('test_b1_s2') {
          agent{label 'b1'}
          steps {     
-            timeout(time: 90, unit: 'MINUTES'){       
+            timeout(time: 45, unit: 'MINUTES'){       
              pre_test()
              sh '''
              cd ${WKC}/tests
@@ -245,7 +263,7 @@ pipeline {
        success {
            emailext (
                subject: "PR-result: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]'",
-                body: '''<!DOCTYPE html>
+                body: """<!DOCTYPE html>
                <html>
                <head>
                <meta charset="UTF-8">
@@ -261,7 +279,7 @@ pipeline {
                            <td>
                                <ul>
                                <div style="font-size:18px">
-                                    <li>构建名称>>分支：${PROJECT_NAME}</li>
+                                    <li>构建名称>>分支：${env.CHANGE_BRANCK}</li>
                                    <li>构建结果：<span style="color:green"> Successful </span></li>
                                    <li>构建编号：${BUILD_NUMBER}</li>
                                    <li>触发用户：${CAUSE}</li>
@@ -275,7 +293,7 @@ pipeline {
                        </tr>
                    </table></font>
                </body>
-                </html>''',
+                </html>""",
                to: "${env.CHANGE_AUTHOR_EMAIL}",
                from: "support@taosdata.com"
            )
@@ -283,7 +301,7 @@ pipeline {
        failure {
            emailext (
                subject: "PR-result: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]'",
-                body: '''<!DOCTYPE html>
+                body: """<!DOCTYPE html>
                <html>
                <head>
                <meta charset="UTF-8">
@@ -299,7 +317,7 @@ pipeline {
                            <td>
                                <ul>
                                <div style="font-size:18px">
-                                    <li>构建名称>>分支：${PROJECT_NAME}</li>
+                                    <li>构建名称>>分支：${env.CHANGE_BRANCK}</li>
                                    <li>构建结果：<span style="color:green"> Successful </span></li>
                                    <li>构建编号：${BUILD_NUMBER}</li>
                                    <li>触发用户：${CAUSE}</li>
@@ -313,7 +331,7 @@ pipeline {
                        </tr>
                    </table></font>
                </body>
-                </html>''',
+                </html>""",
                to: "${env.CHANGE_AUTHOR_EMAIL}",
                from: "support@taosdata.com"
            )