Merge pull request #4954 from taosdata/test/testcase

[TD-2784]<test>test pr from forked repo
This commit is contained in:
huili 2021-01-20 11:08:10 +08:00 committed by GitHub
commit cf8230acf8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 6 deletions

9
Jenkinsfile vendored
View File

@ -41,13 +41,10 @@ def pre_test(){
cd ${WKC} cd ${WKC}
git checkout develop git checkout develop
git reset --hard HEAD~10 git reset --hard HEAD~10 >/dev/null
git pull git pull
git fetch git fetch origin +refs/pull/${CHANGE_ID}/merge
git checkout ${CHANGE_BRANCH} git checkout -qf FETCH_HEAD
git reset --hard HEAD~10
git pull
git merge develop
cd ${WK} cd ${WK}
git reset --hard HEAD~10 git reset --hard HEAD~10
git checkout develop git checkout develop