From 1c2a918c3d17ea6e9b85c32ed5ff1ec50b993e2b Mon Sep 17 00:00:00 2001 From: liuyq-617 Date: Tue, 19 Jan 2021 14:38:55 +0800 Subject: [PATCH 1/2] [TD-2784]test pr from forked repo --- Jenkinsfile | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ebac32cb24..9151b22576 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -41,13 +41,10 @@ def pre_test(){ cd ${WKC} git checkout develop - git reset --hard HEAD~10 + git reset --hard HEAD~10 >/dev/null git pull - git fetch - git checkout ${CHANGE_BRANCH} - git reset --hard HEAD~10 - git pull - git merge develop + git fetch origin +refs/pull/${CHANGE_ID}/merge + cd ${WK} git reset --hard HEAD~10 git checkout develop From 0548a495a456970dc3d84c481dab7ce1fea56d41 Mon Sep 17 00:00:00 2001 From: liuyq-617 Date: Tue, 19 Jan 2021 14:43:28 +0800 Subject: [PATCH 2/2] test for 'git fetch origin +refs/pull/#/merge' --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9151b22576..f793d8c773 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -44,7 +44,7 @@ def pre_test(){ git reset --hard HEAD~10 >/dev/null git pull git fetch origin +refs/pull/${CHANGE_ID}/merge - + git checkout -qf FETCH_HEAD cd ${WK} git reset --hard HEAD~10 git checkout develop