From 92b70bc11edf87c78e9bea63c8113de047383c1e Mon Sep 17 00:00:00 2001 From: rameshthoomu Date: Thu, 6 Dec 2018 14:36:14 -0500 Subject: [PATCH] FABN-1051 Update pipeline script This change fix the condition failed to fetch the patchset Change-Id: I146ca68d2ef5dd847d098e09f1bb1ca76dd38aae Signed-off-by: rameshthoomu --- Jenkinsfile.x | 2 +- Jenkinsfile.z | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile.x b/Jenkinsfile.x index 1d3f2507b8..2c007f1c4c 100644 --- 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 index 846ef19f61..114d6cc9ae 100644 --- 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()