From fa61ef8e1d9c32e2aafef1ed15fd9af8faf8cf09 Mon Sep 17 00:00:00 2001 From: Oskar Thoren Date: Thu, 4 Jan 2018 23:01:01 +0900 Subject: [PATCH] Jenknis: Fix parameterized build if rebase test fails If it does build shouldn't exit --- Jenkinsfile.parameters | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile.parameters b/Jenkinsfile.parameters index 0db0f24724..2b9123a3a9 100644 --- a/Jenkinsfile.parameters +++ b/Jenkinsfile.parameters @@ -32,7 +32,7 @@ node ('macos1') { sh 'git checkout ' + BRANCH_NAME sh 'rm -rf node_modules' - sh 'test ${JENKINS_REBASE_DEVELOP} -eq 1 && git rebase origin/develop' + sh 'test ${JENKINS_REBASE_DEVELOP} -eq 1 && git rebase origin/develop || echo "Not rebasing on develop."' // Assume all parameters are set in Jenkins 'Parameterized build' // TODO(oskarth): Consider read/write from .env to avoid having to specify in Jenkins again