diff --git a/Jenkinsfile b/Jenkinsfile index 2ea765759059ecb6dfc8d8136c0f00c0cbb9ddff..539a37af4fcf1fb83911ed0b7ac865600b8de73b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -43,7 +43,15 @@ def pre_test(){ git checkout develop git pull git fetch + ''' + catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { + sh ''' + git branch -D ${CHANGE_BRANCH} + ''' + } + git checkout ${CHANGE_BRANCH} + git pull git merge develop cd ${WK} git reset --hard