提交 70b9a07e 编写于 作者: L liuyq-617

fix error

上级 1fc7765d
...@@ -37,13 +37,13 @@ def pre_test(){ ...@@ -37,13 +37,13 @@ def pre_test(){
sudo rmtaos sudo rmtaos
''' '''
} }
sh ''' sh """
cd ${WKC} cd ${WKC}
git checkout develop git checkout develop
git reset --hard HEAD~10 >/dev/null git reset --hard HEAD~10 >/dev/null
git pull git pull
git fetch origin +refs/pull/${CHANGE_ID}/merge git fetch origin +refs/pull/${env.CHANGE_ID}/merge
git checkout -qf FETCH_HEAD 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' || exit 0
cd ${WK} cd ${WK}
...@@ -60,7 +60,7 @@ def pre_test(){ ...@@ -60,7 +60,7 @@ def pre_test(){
make > /dev/null make > /dev/null
make install > /dev/null make install > /dev/null
cd ${WKC}/tests cd ${WKC}/tests
''' """
return 1 return 1
} }
def kipstage=0 def kipstage=0
...@@ -76,13 +76,13 @@ pipeline { ...@@ -76,13 +76,13 @@ pipeline {
stage('pre_build'){ stage('pre_build'){
agent{label 'master'} agent{label 'master'}
steps { steps {
sh''' sh"""
cd ${WORKSPACE} cd ${WORKSPACE}
git checkout develop git checkout develop
git pull git pull
git fetch origin +refs/pull/${CHANGE_ID}/merge git fetch origin +refs/pull/${env.CHANGE_ID}/merge
git checkout -qf FETCH_HEAD git checkout -qf FETCH_HEAD
''' """
script{ script{
skipstage=sh(script:"git --no-pager diff --name-only FETCH_HEAD develop|grep -v -E '.*md|//src//connector|Jenkinsfile|test-all.sh' || echo 1 ",returnStdout:true) skipstage=sh(script:"git --no-pager diff --name-only FETCH_HEAD develop|grep -v -E '.*md|//src//connector|Jenkinsfile|test-all.sh' || echo 1 ",returnStdout:true)
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册