diff --git a/Jenkinsfile b/Jenkinsfile index e7603b578bf2c7718e67fbd9fda1674db49c07c0..45993ffe05468a624f97611259d21cdd62060ce5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -42,14 +42,14 @@ def pre_test(){ cd ${WKC} git checkout develop git reset --hard HEAD~10 >/dev/null - git pull + git pull >/dev/null git fetch origin +refs/pull/${CHANGE_ID}/merge git checkout -qf FETCH_HEAD - git --no-pager diff --name-only FETCH_HEAD $(git merge-base FETCH_HEAD develop)|grep -v -E '.*md|//src//connector|Jenkinsfile' || exit 0 + git --no-pager diff --name-only FETCH_HEAD $(git merge-base FETCH_HEAD develop)|grep -v -E '.*md|//src//connector|Jenkinsfile' find ${WKC}/tests/pytest -name \'*\'.sql -exec rm -rf {} \\; cd ${WK} git reset --hard HEAD~10 - git checkout develop + git checkout develop >/dev/null git pull cd ${WK} export TZ=Asia/Harbin