From 8c82e18fb8d891b55ad11095b3477bc907dfd3da Mon Sep 17 00:00:00 2001 From: liuyq-617 Date: Mon, 28 Dec 2020 10:58:29 +0800 Subject: [PATCH] fix error --- Jenkinsfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index ad5fca4d3c..539a37af4f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -43,7 +43,13 @@ def pre_test(){ git checkout develop git pull git fetch - git branch -D ${CHANGE_BRANCH} + ''' + catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { + sh ''' + git branch -D ${CHANGE_BRANCH} + ''' + } + git checkout ${CHANGE_BRANCH} git pull git merge develop -- GitLab