catch if not using gerrit triggers

[osm/devops.git] / jenkins / ci-pipelines / ci_stage_3.groovy

diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy
index d8751bb..b9dda53 100644 (file)
--- a/jenkins/ci-pipelines/ci_stage_3.groovy
+++ b/jenkins/ci-pipelines/ci_stage_3.groovy
@@ -132,8 +132,8 @@ node("${params.NODE}") {
 
                 // merge the change logs
                 sh """
-                   rm -f changelog/osm-changelog.html
-                   [ ! -d changelog ] || for mdgchange in \$(ls changelog); do cat changelog/\$mdgchange >> changelog/osm-changelog.html; done
+                   rm -f changelog/changelog-osm.html
+                   [ ! -d changelog ] || for mdgchange in \$(ls changelog); do cat changelog/\$mdgchange >> changelog/changelog-osm.html; done
                    """
             }
             // start an apache server to serve up the images
@@ -198,6 +198,7 @@ node("${params.NODE}") {
             stage("stage_4") {
                 def downstream_params = [
                     string(name: 'CONTAINER_NAME', value: container_name),
+                    string(name: 'NODE', value: NODE_NAME.split()[0]),
                 ]
                 stage_4_result = build job: "${params.DOWNSTREAM_STAGE_NAME}/${GERRIT_BRANCH}", parameters: downstream_params, propagate: false