FABN-1051 Update pipeline script

This change fix the condition failed to fetch the patchset Change-Id: I146ca68d2ef5dd847d098e09f1bb1ca76dd38aae Signed-off-by: rameshthoomu <rameshbabu.thoomu@gmail.com>
hyperledger · Dec 6, 2018 · 92b70bc · 92b70bc
1 parent 18ba6d6
commit 92b70bc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Jenkinsfile.x b/Jenkinsfile.x
@@ -16,7 +16,7 @@ node ('hyp-x') { // trigger build on x86_64 node
      env.PROJECT_DIR = "gopath/src/github.com/hyperledger"
      env.GOPATH = "$WORKSPACE/gopath"
      env.PATH = "$GOPATH/bin:/usr/local/bin:/usr/bin:/usr/local/sbin:/usr/sbin:${nodeHome}/bin:$PATH"
-     def jobname = sh(returnStdout: true, script: 'echo ${JOB_NAME} | grep "verify" && echo patchset || echo merge').trim()
+     def jobname = sh(returnStdout: true, script: 'echo ${JOB_NAME} | grep -q "verify" && echo patchset || echo merge').trim()
      def failure_stage = "none"
 // delete working directory
      deleteDir()

diff --git a/Jenkinsfile.z b/Jenkinsfile.z
@@ -18,7 +18,7 @@ node('hyp-z') {
      env.PROJECT_DIR = "gopath/src/github.com/hyperledger"
      env.GOPATH = "$WORKSPACE/gopath"
      env.PATH = "$GOPATH/bin:/usr/local/bin:/usr/bin:/usr/local/sbin:/usr/sbin:~/npm/bin:/home/jenkins/.nvm/versions/node/v${NODE_VER}/bin:$PATH"
-     def jobname = sh(returnStdout: true, script: 'echo ${JOB_NAME} | grep "verify" && echo patchset || echo merge').trim()
+     def jobname = sh(returnStdout: true, script: 'echo ${JOB_NAME} | grep -q "verify" && echo patchset || echo merge').trim()
      def failure_stage = "none"
 // delete working directory
      deleteDir()