Merge pull request #5695 from taosdata/test/testcase

[TD-3671]<test>change target branch
This commit is contained in:
huili 2021-04-06 17:05:21 +08:00 committed by GitHub
commit a85b9911c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 3 deletions

14
Jenkinsfile vendored
View File

@ -50,7 +50,16 @@ def pre_test(){
git clean -dfx
cd ${WK}
git reset --hard HEAD~10
git checkout develop
'''
script {
if (env.CHANGE_TARGET == 'master') {
sh 'git checkout master'
}
else {
sh 'git checkout develop'
}
}
sh '''
git pull >/dev/null
cd ${WK}
export TZ=Asia/Harbin
@ -92,7 +101,8 @@ pipeline {
git pull
git fetch origin +refs/pull/${CHANGE_ID}/merge
git checkout -qf FETCH_HEAD
'''
'''
script{
env.skipstage=sh(script:"cd ${WORKSPACE}.tes && git --no-pager diff --name-only FETCH_HEAD develop|grep -v -E '.*md|//src//connector|Jenkinsfile|test-all.sh' || echo 0 ",returnStdout:true)
}

View File

@ -1,4 +1,4 @@
#!/bin/bash
#!/bin/bash
# This is the script for us to try to cause the TDengine server or client to crash
#