Merge pull request #5133 from taosdata/test/jenkins
[TD-2493]<test>fix email error
This commit is contained in:
huili
GitHub
commit
ef465a71e3
|
|
@ -31,6 +31,7 @@ def abort_previous(){
|
||||||
if (buildNumber > 1) milestone(buildNumber - 1)
|
if (buildNumber > 1) milestone(buildNumber - 1)
|
||||||
milestone(buildNumber)
|
milestone(buildNumber)
|
||||||
}
|
}
|
||||||
|
def kipstage=0
|
||||||
def pre_test(){
|
def pre_test(){
|
||||||
catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
|
catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
|
||||||
sh '''
|
sh '''
|
||||||
|
|
@ -72,12 +73,29 @@ pipeline {
|
||||||
}
|
}
|
||||||
|
|
||||||
stages {
|
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') {
|
stage('Parallel test stage') {
|
||||||
//only build pr
|
//only build pr
|
||||||
when {
|
when {
|
||||||
changeRequest()
|
changeRequest()
|
||||||
|
expression {
|
||||||
|
skipstage == 0
|
||||||
|
}
|
||||||
}
|
}
|
||||||
parallel {
|
parallel {
|
||||||
stage('python_1_s1') {
|
stage('python_1_s1') {
|
||||||
|
|
@ -127,7 +145,7 @@ pipeline {
|
||||||
stage('test_b1_s2') {
|
stage('test_b1_s2') {
|
||||||
agent{label 'b1'}
|
agent{label 'b1'}
|
||||||
steps {
|
steps {
|
||||||
timeout(time: 90, unit: 'MINUTES'){
|
timeout(time: 45, unit: 'MINUTES'){
|
||||||
pre_test()
|
pre_test()
|
||||||
sh '''
|
sh '''
|
||||||
cd ${WKC}/tests
|
cd ${WKC}/tests
|
||||||
|
|
@ -244,8 +262,8 @@ pipeline {
|
||||||
|
|
||||||
success {
|
success {
|
||||||
emailext (
|
emailext (
|
||||||
subject: "PR-result: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]'",
|
subject: "PR-result: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]' SUCCESS",
|
||||||
body: '''<!DOCTYPE html>
|
body: """<!DOCTYPE html>
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8">
|
<meta charset="UTF-8">
|
||||||
|
|
@ -261,29 +279,29 @@ pipeline {
|
||||||
<td>
|
<td>
|
||||||
<ul>
|
<ul>
|
||||||
<div style="font-size:18px">
|
<div style="font-size:18px">
|
||||||
<li>构建名称>>分支：${PROJECT_NAME}</li>
|
<li>构建名称>>分支：${env.BRANCH_NAME}</li>
|
||||||
<li>构建结果：<span style="color:green"> Successful </span></li>
|
<li>构建结果：<span style="color:green"> Successful </span></li>
|
||||||
<li>构建编号：${BUILD_NUMBER}</li>
|
<li>构建编号：${BUILD_NUMBER}</li>
|
||||||
<li>触发用户：${CAUSE}</li>
|
<li>触发用户：${env.CHANGE_AUTHOR}</li>
|
||||||
<li>提交信息：${CHANGE_TITLE}</li>
|
<li>提交信息：${CHANGE_TITLE}</li>
|
||||||
<li>构建地址：<a href=${BUILD_URL}>${BUILD_URL}</a></li>
|
<li>构建地址：<a href=${BUILD_URL}>${BUILD_URL}</a></li>
|
||||||
<li>构建日志：<a href=${BUILD_URL}console>${BUILD_URL}console</a></li>
|
<li>构建日志：<a href=${BUILD_URL}console>${BUILD_URL}console</a></li>
|
||||||
<li>变更集：${JELLY_SCRIPT}</li>
|
|
||||||
</div>
|
</div>
|
||||||
</ul>
|
</ul>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table></font>
|
</table></font>
|
||||||
</body>
|
</body>
|
||||||
</html>''',
|
</html>""",
|
||||||
to: "${env.CHANGE_AUTHOR_EMAIL}",
|
to: "${env.CHANGE_AUTHOR_EMAIL}",
|
||||||
from: "support@taosdata.com"
|
from: "support@taosdata.com"
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
failure {
|
failure {
|
||||||
emailext (
|
emailext (
|
||||||
subject: "PR-result: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]'",
|
subject: "PR-result: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]' FAIL",
|
||||||
body: '''<!DOCTYPE html>
|
body: """<!DOCTYPE html>
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8">
|
<meta charset="UTF-8">
|
||||||
|
|
@ -299,21 +317,21 @@ pipeline {
|
||||||
<td>
|
<td>
|
||||||
<ul>
|
<ul>
|
||||||
<div style="font-size:18px">
|
<div style="font-size:18px">
|
||||||
<li>构建名称>>分支：${PROJECT_NAME}</li>
|
<li>构建名称>>分支：${env.BRANCH_NAME}</li>
|
||||||
<li>构建结果：<span style="color:green"> Successful </span></li>
|
<li>构建结果：<span style="color:green"> Successful </span></li>
|
||||||
<li>构建编号：${BUILD_NUMBER}</li>
|
<li>构建编号：${BUILD_NUMBER}</li>
|
||||||
<li>触发用户：${CAUSE}</li>
|
<li>触发用户：${env.CHANGE_AUTHOR}</li>
|
||||||
<li>提交信息：${CHANGE_TITLE}</li>
|
<li>提交信息：${CHANGE_TITLE}</li>
|
||||||
<li>构建地址：<a href=${BUILD_URL}>${BUILD_URL}</a></li>
|
<li>构建地址：<a href=${BUILD_URL}>${BUILD_URL}</a></li>
|
||||||
<li>构建日志：<a href=${BUILD_URL}console>${BUILD_URL}console</a></li>
|
<li>构建日志：<a href=${BUILD_URL}console>${BUILD_URL}console</a></li>
|
||||||
<li>变更集：${JELLY_SCRIPT}</li>
|
|
||||||
</div>
|
</div>
|
||||||
</ul>
|
</ul>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table></font>
|
</table></font>
|
||||||
</body>
|
</body>
|
||||||
</html>''',
|
</html>""",
|
||||||
to: "${env.CHANGE_AUTHOR_EMAIL}",
|
to: "${env.CHANGE_AUTHOR_EMAIL}",
|
||||||
from: "support@taosdata.com"
|
from: "support@taosdata.com"
|
||||||
)
|
)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue