diff --git a/Jenkinsfile b/Jenkinsfile index f4292da34918e027304edbb656d107f9a3767d6d..73bb832d8ea4c16d65f6fff88cb8844415c19f9c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -41,13 +41,10 @@ def pre_test(){ cd ${WKC} git checkout develop - git reset --hard HEAD~10 - git pull - git fetch - git checkout ${CHANGE_BRANCH} - git reset --hard HEAD~10 + git reset --hard HEAD~10 >/dev/null git pull - git merge develop + git fetch origin +refs/pull/${CHANGE_ID}/merge + git checkout -qf FETCH_HEAD cd ${WK} git reset --hard HEAD~10 git checkout develop