diff --git a/Jenkinsfile b/Jenkinsfile index 297dde63e196ff3ae4083926f51bd6a88c1c9f3a..c4e0a7d27b099c477db765d37741541afed55ccd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -70,6 +70,7 @@ def pre_test(){ git fetch origin +refs/pull/${CHANGE_ID}/merge git checkout -qf FETCH_HEAD git clean -dfx + git ls-files --stage | grep 160000 | awk '{print $4}' | xargs git rm --cached git submodule update --init --recursive cd ${WK} git reset --hard HEAD~10 @@ -143,6 +144,7 @@ def pre_test_noinstall(){ git fetch origin +refs/pull/${CHANGE_ID}/merge git checkout -qf FETCH_HEAD git clean -dfx + git ls-files --stage | grep 160000 | awk '{print $4}' | xargs git rm --cached git submodule update --init --recursive cd ${WK} git reset --hard HEAD~10 @@ -213,6 +215,7 @@ def pre_test_mac(){ git fetch origin +refs/pull/${CHANGE_ID}/merge git checkout -qf FETCH_HEAD git clean -dfx + git ls-files --stage | grep 160000 | awk '{print $4}' | xargs git rm --cached git submodule update --init --recursive cd ${WK} git reset --hard HEAD~10