diff --git a/Jenkinsfile b/Jenkinsfile
index 3119b5031934307452a1b502d8606c32194f4fa2..fc1a408755a341f69923ac8a1a9499148c79b17c 100644
--- 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
@@ -244,8 +262,8 @@ pipeline {
success {
emailext (
- subject: "PR-result: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]'",
- body: '''
+ subject: "PR-result: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]' SUCCESS",
+ body: """
@@ -261,29 +279,29 @@ pipeline {
- - 构建名称>>分支：${PROJECT_NAME}
+ - 构建名称>>分支：${env.BRANCH_NAME}
- 构建结果： Successful
- 构建编号：${BUILD_NUMBER}
- - 触发用户：${CAUSE}
+ - 触发用户：${env.CHANGE_AUTHOR}
- 提交信息：${CHANGE_TITLE}
- 构建地址：${BUILD_URL}
- 构建日志：${BUILD_URL}console
- - 变更集：${JELLY_SCRIPT}
+
|
- ''',
+