From 37b00bc49099dacf007d004cb115b8a78f842ce3 Mon Sep 17 00:00:00 2001
From: Vanessa Rene Valderrama <vvalderrama@linuxfoundation.org>
Date: Tue, 16 Oct 2018 14:47:28 -0500
Subject: Modify archive-artifacts to allow for a list

Modifying the archive-artifacts syntax to allow for a list and resolve
JJB 2.5.0 failures

Change-Id: Id356bac954bea0a0a22b9e6f2815f4453c974c6b
Signed-off-by: Vanessa Rene Valderrama <vvalderrama@linuxfoundation.org>
---
 jjb/vpp/vpp.yaml | 46 ++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 38 insertions(+), 8 deletions(-)

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index dace65e3e..ee4781e4a 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -176,7 +176,11 @@
 
     publishers:
       - archive:
-          artifacts: 'build-root/*.rpm,build-root/*.deb,dpdk/*.rpm,dpdk/*.deb'
+          artifacts: >
+            **/build-root/*.rpm,
+            **/build-root/*.deb,
+            **/dpdk/*.rpm,
+            **/dpdk/*.deb
           allow-empty: 'true'
           fingerprint: false
           only-if-success: true
@@ -267,7 +271,11 @@
 
     publishers:
       - archive:
-          artifacts: 'build-root/*.rpm,build-root/*.deb,dpdk/*.rpm,dpdk/*.deb'
+          artifacts: >
+            **/build-root/*.rpm,
+            **/build-root/*.deb,
+            **/dpdk/*.rpm,
+            **/dpdk/*.deb
           allow-empty: 'true'
           fingerprint: false
           only-if-success: true
@@ -326,7 +334,11 @@
 
     publishers:
       - archive:
-          artifacts: 'build-root/*.rpm,build-root/*.deb,dpdk/*.rpm,dpdk/*.deb'
+          artifacts: >
+            **/build-root/*.rpm,
+            **/build-root/*.deb,
+            **/dpdk/*.rpm,
+            **/dpdk/*.deb
           allow-empty: 'true'
           fingerprint: false
           only-if-success: true
@@ -413,7 +425,11 @@
 
     publishers:
       - archive:
-          artifacts: 'build-root/*.rpm,build-root/*.deb,dpdk/*.rpm,dpdk/*.deb'
+          artifacts: >
+            **/build-root/*.rpm,
+            **/build-root/*.deb,
+            **/dpdk/*.rpm,
+            **/dpdk/*.deb
           allow-empty: 'true'
           fingerprint: false
           only-if-success: true
@@ -565,7 +581,12 @@
 
     publishers:
       - archive:
-          artifacts: 'build-root/*.rpm,build-root/*.deb,dpdk/*.rpm,dpdk/*.deb'
+          artifacts: >
+            **/build-root/*.rpm,
+            **/build-root/*.deb,
+            **/dpdk/*.rpm,
+            **/dpdk/*.deb
+
           allow-empty: 'true'
           fingerprint: false
           only-if-success: true
@@ -715,7 +736,11 @@
 
     publishers:
       - archive:
-          artifacts: 'build-root/*.rpm,build-root/*.deb,dpdk/*.rpm,dpdk/*.deb'
+          artifacts: >
+            **/build-root/*.rpm,
+            **/build-root/*.deb,
+            **/dpdk/*.rpm,
+            **/dpdk/*.deb
           allow-empty: 'true'
           fingerprint: false
           only-if-success: true
@@ -787,7 +812,10 @@
 
     publishers:
       - archive-artifacts:
-          artifacts: 'csit/report.html, csit/log.html, csit/output.xml'
+          artifacts: >
+            **/csit/report.html,
+            **/csit/log.html,
+            **/csit/output.xml
           latest-only: false
 
       - robot-report:
@@ -868,7 +896,9 @@
 
     publishers:
       - archive-artifacts:
-          artifacts: 'csit_new/*.*, csit_parent/*.*'
+          artifacts: >
+            **/csit_new/*.*,
+            **/csit_parent/*.*
           latest-only: false
 
       - robot-report:
-- 
cgit 1.2.3-korg