commit 2cc51444ccd64f53d6deb5b3721f4cb01f170da0
author Mike Marchetti <mmarchetti@sandvine.com> Fri Jun 23 10:24:22 2017 -0400
committer Mike Marchetti <mmarchetti@sandvine.com> Fri Jun 23 10:24:22 2017 -0400
tree e7e1b32fe445316337def7d049496b7534cef100
parent 66e1c2bc13002c40974623f0fb8dc6ef0f2cdb17

update to jenkins

Signed-off-by: Mike Marchetti <mmarchetti@sandvine.com>

Jenkinsfile

diff --git a/Jenkinsfile b/Jenkinsfile
index 86e0514..d0bc7ac 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,3 +1,12 @@
+properties([
+    parameters([
+        string(defaultValue: env.GERRIT_BRANCH, description: '', name: 'GERRIT_BRANCH'),
+        string(defaultValue: env.GERRIT_PROJEC, description: '', name: 'GERRIT_PROJECT'),
+        string(defaultValue: env.GERRIT_REFSPEC, description: '', name: 'GERRIT_REFSPEC'),
+        string(defaultValue: env.GERRIT_PATCHSET_REVISION, description: '', name: 'GERRIT_PATCHSET_REVISION'),
+    ])
+])
+
 def Get_MDG(project) {
     // split the project.
     def values = project.split('/')
@@ -28,7 +37,9 @@
     mdg = Get_MDG("${GERRIT_PROJECT}")
     println("MDG is ${mdg}")
 
-    if ( GERRIT_EVENT_TYPE.equals('change-merged') ) {
+    if ( env.GERRIT_EVENT_TYPE != null ) {
+        // pipeline running from gerrit trigger.
+        // kickoff the downstream multibranch pipeline
         def downstream_params = [
             string(name: 'GERRIT_BRANCH', value: GERRIT_BRANCH),
             string(name: 'GERRIT_PROJECT', value: GERRIT_PROJECT),
@@ -54,7 +65,6 @@
 
         container_name = "${GERRIT_PROJECT}-${GERRIT_BRANCH}"
 
-
         stage('Docker-Build') {
             sh "docker build -t ${container_name} ."
         }