update to jenkins file

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

diff --git a/Jenkinsfile b/Jenkinsfile
index e30c94b..2f6b6f2 100644 (file)
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -10,11 +10,11 @@ def Get_MDG(project) {
 
 def project_checkout() {
     // checkout the project
-    git url: "https://osm.etsi.org/gerrit/${GERRIT_PROJECT}"
+    git url: "https://osm.etsi.org/gerrit/${env.GERRIT_PROJECT}"
 
-    sh "git fetch origin ${GERRIT_REFSPEC}"
-    if (GERRIT_PATCHSET_REVISION.size() > 0 ) {
-        sh "git checkout -f ${GERRIT_PATCHSET_REVISION}"
+    sh "git fetch origin ${env.GERRIT_REFSPEC}"
+    if (env.GERRIT_PATCHSET_REVISION.size() > 0 ) {
+        sh "git checkout -f ${env.GERRIT_PATCHSET_REVISION}"
     }
 }
 
@@ -25,40 +25,57 @@ def devops_checkout() {
 }
 
 node {
-    stage('Prepare') {
-        sh 'env'
-        devops_checkout()
-    }
+    mdg = Get_MDG("${env.GERRIT_PROJECT}")
+    println("MDG is ${mdg}")
 
-    stage('Checkout') {
-        project_checkout()
+    if ( env.GERRIT_EVENT_TYPE.equals('change-merged') ) {
+        def downstream_params = [
+            string(name: 'GERRIT_BRANCH', value: env.GERRIT_BRANCH),
+            string(name: 'GERRIT_PROJECT', value: env.GERRIT_PROJECT),
+            string(name: 'GERRIT_REFSPEC', value: env.GERRIT_REFSPEC),
+            string(name: 'GERRIT_PATCHSET_REVISION', value: env.GERRIT_PATCHSET_REVISION),
+        ]
+        result = build job: "${mdg}/${env.GERRIT_BRANCH}", parameters: downstream_params, propagate: true
+        if (result.getResult() != 'SUCCESS') {
+            project = result.getProjectName()
+            build = result.getNumber()
+            error("${project} build ${build} failed")
+        }
     }
+    else {
+        stage('Prepare') {
+            sh 'env'
+            devops_checkout()
+        }
 
-    container_name = "${GERRIT_PROJECT}-${GERRIT_BRANCH}"
+        stage('Checkout') {
+            project_checkout()
+        }
 
-    mdg = Get_MDG("${GERRIT_PROJECT}")
-    println("MDG is ${mdg}")
+        container_name = "${env.GERRIT_PROJECT}-${env.GERRIT_BRANCH}"
 
-    stage('Docker-Build') {
-        sh "docker build -t ${container_name} ."
-    }
 
-    withDockerContainer("${container_name}") {
-        stage('Docker-Setup') {
-            sh '''
-               groupadd -o -g $(id -g) -r jenkins
-               useradd -o -u $(id -u) --create-home -r -g  jenkins jenkins
-               '''
-        }
-        stage('Test') {
-            sh 'devops-stages/stage-test.sh'
-        }
-        stage('Build') {
-            sh 'devops-stages/stage-build.sh'
+        stage('Docker-Build') {
+            sh "docker build -t ${container_name} ."
         }
-        stage('Archive') {
-            sh 'devops-stages/stage-archive.sh'
-            archiveArtifacts artifacts: "dists/**,pool/${mdg}/*.deb", fingerprint: true
+
+        withDockerContainer("${container_name}") {
+            stage('Docker-Setup') {
+                sh '''
+                   groupadd -o -g $(id -g) -r jenkins
+                   useradd -o -u $(id -u) --create-home -r -g  jenkins jenkins
+                   '''
+            }
+            stage('Test') {
+                sh 'devops-stages/stage-test.sh'
+            }
+            stage('Build') {
+                sh 'devops-stages/stage-build.sh'
+            }
+            stage('Archive') {
+                sh 'devops-stages/stage-archive.sh'
+                archiveArtifacts artifacts: "dists/**,pool/${mdg}/*.deb", fingerprint: true
+            }
         }
-    }
+     }
 }