From 5de788f81b9caa55913f5bb44f4af27a5fb5c43d Mon Sep 17 00:00:00 2001
From: Vanessa Rene Valderrama <vvalderrama@linuxfoundation.org>
Date: Wed, 16 Oct 2019 11:50:50 -0500
Subject: [PATCH] Modify VPP artifacts

This change is to remove packages from archived artifacts. The packages
are available in the FD.io packagecloud repo.

Change-Id: I215479ad49442120305d4d9e36fa07fb5c259365
Signed-off-by: Vanessa Rene Valderrama <vvalderrama@linuxfoundation.org>
---
 jjb/vpp/vpp.yaml | 66 ++++++--------------------------------------------------
 1 file changed, 6 insertions(+), 60 deletions(-)

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 46a04feac..fb5af2dcb 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -182,16 +182,7 @@
     project-type: freestyle
     node: '{os}-us'
     concurrent: true
-    archive-artifacts: >
-      **/build-root/*.rpm
-      **/build-root/*.deb
-      **/dpdk/*.rpm
-      **/dpdk/*.deb
-      **/tmp/vpp-failed-unittests/*/* **/core
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
+    archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
 
     triggers:
       - gerrit-trigger-checkstyle:
@@ -251,15 +242,6 @@
 
     project-type: freestyle
     node: '{os}-us'
-    archive-artifacts: >
-      **/build-root/*.rpm
-      **/build-root/*.deb
-      **/dpdk/*.rpm
-      **/dpdk/*.deb
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -334,15 +316,7 @@
     project-type: freestyle
     node: '{os}arm-us'
     concurrent: true
-    archive-artifacts: >
-      **/build-root/*.rpm
-      **/build-root/*.deb
-      **/dpdk/*.rpm
-      **/dpdk/*.deb
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
+    archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -393,7 +367,6 @@
     publishers:
       - fdio-infra-shiplogs:
           maven-version: 'mvn36'
-          archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
       - naginator:
           rerun-unstable-builds: false
           max-failed-builds: 1
@@ -404,15 +377,6 @@
 
     project-type: freestyle
     node: '{os}arm-m'
-    archive-artifacts: >
-      **/build-root/*.rpm
-      **/build-root/*.deb
-      **/dpdk/*.rpm
-      **/dpdk/*.deb
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -489,6 +453,7 @@
     project-type: freestyle
     node: '{os}-us'
     concurrent: true
+    archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -578,7 +543,6 @@
     publishers:
       - fdio-infra-shiplogs:
           maven-version: 'mvn36'
-          archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
       - naginator:
           rerun-unstable-builds: true
           max-failed-builds: 1
@@ -590,15 +554,7 @@
     project-type: freestyle
     node: '{os}-us'
     concurrent: true
-    archive-artifacts: >
-      **/build-root/*.rpm
-      **/build-root/*.deb
-      **/dpdk/*.rpm
-      **/dpdk/*.deb
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
+    archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -648,7 +604,6 @@
     publishers:
       - fdio-infra-shiplogs:
           maven-version: 'mvn36'
-          archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
       - naginator:
           rerun-unstable-builds: false
           max-failed-builds: 2
@@ -660,6 +615,7 @@
     project-type: freestyle
     node: 'ubuntu1804-us'
     concurrent: true
+    archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -705,7 +661,6 @@
     publishers:
       - fdio-infra-shiplogs:
           maven-version: 'mvn36'
-          archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
       - naginator:
           rerun-unstable-builds: false
           max-failed-builds: 1
@@ -717,6 +672,7 @@
     project-type: freestyle
     node: 'ubuntu1804-us'
     concurrent: true
+    archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -808,22 +764,12 @@
           fixed: true
       - fdio-infra-shiplogs:
           maven-version: 'mvn36'
-          archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
 
 - job-template:
     name: 'vpp-merge-{stream}-{os}'
 
     project-type: freestyle
     node: '{os}-us'
-    archive-artifacts: >
-      **/build-root/*.rpm
-      **/build-root/*.deb
-      **/dpdk/*.rpm
-      **/dpdk/*.deb
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
-- 
2.16.6