From 517b77e903a2e6e35bc056be613fe0b97936cf73 Mon Sep 17 00:00:00 2001 From: liuyq-617 Date: Wed, 7 Apr 2021 09:46:09 +0800 Subject: [PATCH] fix --- Jenkinsfile | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 25bf86d9cc..1931419a1b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -46,13 +46,20 @@ def pre_test(){ ''' script { if (env.CHANGE_TARGET == 'master') { - sh 'git checkout master' + sh ''' + cd ${WKC} + git checkout master + ''' } else { - sh 'git checkout develop' + sh ''' + cd ${WKC} + git checkout develop + ''' } } sh''' + cd ${WKC} git pull >/dev/null git fetch origin +refs/pull/${CHANGE_ID}/merge git checkout -qf FETCH_HEAD @@ -62,15 +69,21 @@ def pre_test(){ ''' script { if (env.CHANGE_TARGET == 'master') { - sh 'git checkout master' + sh ''' + cd ${WKC} + git checkout master + ''' } else { - sh 'git checkout develop' + sh ''' + cd ${WKC} + git checkout develop + ''' } } sh ''' - git pull >/dev/null cd ${WK} + git pull >/dev/null export TZ=Asia/Harbin date git clean -dfx -- GitLab