Make sure that shiplogs gets a maven-version

The infra-shiplogs macro needs a maven-version parameter passed to it to
properly operate

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

diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml
index 59a8163..91809d9 100644 (file)
--- a/jjb/ci-management/ci-management.yaml
+++ b/jjb/ci-management/ci-management.yaml
@@ -125,7 +125,8 @@
           jenkins-jobs --conf $JJBINI update --delete-old --workers 4 jjb/
 
     publishers:
-      - infra-shiplogs
+      - infra-shiplogs:
+          maven-version: '{maven-version}'
 
 - job-template:
     name: '{project}-verify-packer'

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index fcf5891..3eca9ec 100644 (file)
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -182,7 +182,7 @@
     publishers:
       - postbuildscript:
           builders:
-            - shell: !include-raw: include-raw-deploy-archives.sh
+            - shell: !include-raw-escape: include-raw-deploy-archives.sh
             - maven-target:
                 maven-version: '{maven-version}'
                 pom: '.archives/deploy-archives.xml'