Merge pull request #7269 from taosdata/revert-7266-test/skci_dev
Revert "test[ci skip]"
This commit is contained in:
commit
4ef9ee502e
|
@ -6,7 +6,7 @@ node {
|
||||||
}
|
}
|
||||||
|
|
||||||
def skipstage=0
|
def skipstage=0
|
||||||
def skipbuild=0
|
|
||||||
def abortPreviousBuilds() {
|
def abortPreviousBuilds() {
|
||||||
def currentJobName = env.JOB_NAME
|
def currentJobName = env.JOB_NAME
|
||||||
def currentBuildNumber = env.BUILD_NUMBER.toInteger()
|
def currentBuildNumber = env.BUILD_NUMBER.toInteger()
|
||||||
|
@ -146,7 +146,6 @@ pipeline {
|
||||||
|
|
||||||
script{
|
script{
|
||||||
env.skipstage=sh(script:"cd ${WORKSPACE}.tes && git --no-pager diff --name-only FETCH_HEAD ${env.CHANGE_TARGET}|grep -v -E '.*md|//src//connector|Jenkinsfile|test-all.sh' || echo 0 ",returnStdout:true)
|
env.skipstage=sh(script:"cd ${WORKSPACE}.tes && git --no-pager diff --name-only FETCH_HEAD ${env.CHANGE_TARGET}|grep -v -E '.*md|//src//connector|Jenkinsfile|test-all.sh' || echo 0 ",returnStdout:true)
|
||||||
env.skipbuild=sh(script: "git log -1 --pretty=%B | fgrep -ie '[skip ci]' -e '[ci skip]'", returnStatus: true)
|
|
||||||
}
|
}
|
||||||
println env.skipstage
|
println env.skipstage
|
||||||
sh'''
|
sh'''
|
||||||
|
@ -161,7 +160,6 @@ pipeline {
|
||||||
changeRequest()
|
changeRequest()
|
||||||
expression {
|
expression {
|
||||||
env.skipstage != 0
|
env.skipstage != 0
|
||||||
env.skipbuild ==1
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
parallel {
|
parallel {
|
||||||
|
|
Loading…
Reference in New Issue