未验证 提交 ee1dfb61 编写于 作者: H Hui Li 提交者: GitHub

Merge pull request #7264 from taosdata/test/test_ci_skip_2.0

Test/test ci skip 2.0 [ci skip]
...@@ -150,6 +150,7 @@ steps: ...@@ -150,6 +150,7 @@ steps:
branch: branch:
- develop - develop
- master - master
- 2.0
--- ---
kind: pipeline kind: pipeline
name: build_trusty name: build_trusty
...@@ -176,6 +177,7 @@ steps: ...@@ -176,6 +177,7 @@ steps:
branch: branch:
- develop - develop
- master - master
- 2.0
--- ---
kind: pipeline kind: pipeline
name: build_xenial name: build_xenial
...@@ -201,6 +203,7 @@ steps: ...@@ -201,6 +203,7 @@ steps:
branch: branch:
- develop - develop
- master - master
- 2.0
--- ---
kind: pipeline kind: pipeline
...@@ -226,6 +229,7 @@ steps: ...@@ -226,6 +229,7 @@ steps:
branch: branch:
- develop - develop
- master - master
- 2.0
--- ---
kind: pipeline kind: pipeline
name: build_centos7 name: build_centos7
...@@ -249,4 +253,4 @@ steps: ...@@ -249,4 +253,4 @@ steps:
branch: branch:
- develop - develop
- master - master
- 2.0
\ No newline at end of file
...@@ -6,7 +6,7 @@ node { ...@@ -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()
...@@ -125,6 +125,7 @@ pipeline { ...@@ -125,6 +125,7 @@ pipeline {
agent{label 'master'} agent{label 'master'}
when { when {
changeRequest() changeRequest()
} }
steps { steps {
script{ script{
...@@ -158,6 +159,8 @@ pipeline { ...@@ -158,6 +159,8 @@ 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'''
...@@ -172,6 +175,7 @@ pipeline { ...@@ -172,6 +175,7 @@ pipeline {
changeRequest() changeRequest()
expression { expression {
env.skipstage != 0 env.skipstage != 0
env.skipbuild ==1
} }
} }
parallel { parallel {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册