Fix mso-libs daily release maven properties

JJB is misformating the macro pass through. Work around it.

Change-Id: Id695c111f8c1838e5bcc19c0c6e4a27e992d5c9c
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>

diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 1d8b9a9..a239d0c 100644 (file)
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -122,8 +122,8 @@
 - job-template:
     # Job template for Java daily release jobs
     #
-    # The purpose of this job template is to run "maven version && maven clean deploy" for
-    # projects using this template.
+    # The purpose of this job template is to run "maven version && maven clean
+    # deploy" for projects using this template.
     #
     # Required Variables:
     #     branch:    git branch (eg. stable/lithium or master)
@@ -176,7 +176,8 @@
       - maven-target:
           maven-version: 'mvn33'
           goals: 'clean deploy'
-          properties: '{maven-deploy-properties}'
+          properties:
+            - '{maven-deploy-properties}'
           settings: '{mvn-settings}'
           settings-type: cfp
           global-settings: 'global-settings'

diff --git a/jjb/mso/mso-libs.yaml b/jjb/mso/mso-libs.yaml
index 28ed86e..99c25d4 100644 (file)
--- a/jjb/mso/mso-libs.yaml
+++ b/jjb/mso/mso-libs.yaml
@@ -12,7 +12,10 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'mso-settings'
-    maven-deploy-properties:
-      - 'deployAtEnd=true'
+    # due to a strange macro / variable translation problem this needs to be
+    # passed as a string block to properly get the properties correctly defined
+    # in the job
+    maven-deploy-properties: |
+      deployAtEnd=true
     files: '**'
     archive-artifacts: ''