revert

dfd1e8ce · liuyq-617 · 75acf33d · dfd1e8ce
隐藏空白更改
内联并排

Showing with 14 addition and 32 deletion

Jenkinsfile Jenkinsfile +14 -32

未找到文件。
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -31,7 +31,6 @@ def abort_previous(){
  if (buildNumber > 1) milestone(buildNumber - 1)
  milestone(buildNumber)
 }
-def kipstage=0
 def pre_test(){
    catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
                sh '''
@@ -73,29 +72,12 @@ 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') {
@@ -145,7 +127,7 @@ pipeline {
        stage('test_b1_s2') {
          agent{label 'b1'}
          steps {     
-            timeout(time: 45, unit: 'MINUTES'){       
+            timeout(time: 90, unit: 'MINUTES'){       
              pre_test()
              sh '''
              cd ${WKC}/tests
@@ -262,8 +244,8 @@ pipeline {
      
        success {
            emailext (
-                subject: "PR-result: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]' SUCCESS",
-                body: """<!DOCTYPE html>
+                subject: "PR-result: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]'",
+                body: '''<!DOCTYPE html>
                <html>
                <head>
                <meta charset="UTF-8">
@@ -279,29 +261,29 @@ pipeline {
                            <td>
                                <ul>
                                <div style="font-size:18px">
-                                    <li>构建名称>>分支：${env.BRANCH_NAME}</li>
+                                    <li>构建名称>>分支：${PROJECT_NAME}</li>
                                    <li>构建结果：<span style="color:green"> Successful </span></li>
                                    <li>构建编号：${BUILD_NUMBER}</li>
-                                    <li>触发用户：${env.CHANGE_AUTHOR}</li>
+                                    <li>触发用户：${CAUSE}</li>
                                    <li>提交信息：${CHANGE_TITLE}</li>
                                    <li>构建地址：<a href=${BUILD_URL}>${BUILD_URL}</a></li>
                                    <li>构建日志：<a href=${BUILD_URL}console>${BUILD_URL}console</a></li>
-                                    
+                                    <li>变更集：${JELLY_SCRIPT}</li>
                                </div>
                                </ul>
                            </td>
                        </tr>
                    </table></font>
                </body>
-                </html>""",
+                </html>''',
                to: "${env.CHANGE_AUTHOR_EMAIL}",
                from: "support@taosdata.com"
            )
        }
        failure {
            emailext (
-                subject: "PR-result: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]' FAIL",
-                body: """<!DOCTYPE html>
+                subject: "PR-result: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]'",
+                body: '''<!DOCTYPE html>
                <html>
                <head>
                <meta charset="UTF-8">
@@ -317,21 +299,21 @@ pipeline {
                            <td>
                                <ul>
                                <div style="font-size:18px">
-                                    <li>构建名称>>分支：${env.BRANCH_NAME}</li>
+                                    <li>构建名称>>分支：${PROJECT_NAME}</li>
                                    <li>构建结果：<span style="color:green"> Successful </span></li>
                                    <li>构建编号：${BUILD_NUMBER}</li>
-                                    <li>触发用户：${env.CHANGE_AUTHOR}</li>
+                                    <li>触发用户：${CAUSE}</li>
                                    <li>提交信息：${CHANGE_TITLE}</li>
                                    <li>构建地址：<a href=${BUILD_URL}>${BUILD_URL}</a></li>
                                    <li>构建日志：<a href=${BUILD_URL}console>${BUILD_URL}console</a></li>
-                                    
+                                    <li>变更集：${JELLY_SCRIPT}</li>
                                </div>
                                </ul>
                            </td>
                        </tr>
                    </table></font>
                </body>
-                </html>""",
+                </html>''',
                to: "${env.CHANGE_AUTHOR_EMAIL}",
                from: "support@taosdata.com"
            )