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