diff --git a/Jenkinsfile b/Jenkinsfile index ebac32cb241af1a35556262690544f84ca94d9fc..9151b22576602cdc8df5d16701fbb5f4a89bb0c6 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 + cd ${WK} git reset --hard HEAD~10 git checkout develop