From bb65ed4c7698edd26286d2a8a6d89b4d5580f65c Mon Sep 17 00:00:00 2001
From: Dave Wallace <dwallacelf@gmail.com>
Date: Wed, 21 Apr 2021 12:52:51 -0400
Subject: Separate VPP stacktrace generation from artifact archiving

- Separate removal of socket files in workspace archive directory
  from archiving of artifacts
- Clean up deprecated workspace-archive-artifacts-parameter macro

Change-Id: I11c7fe55d3412fb7261da9f0cfb809a152ae1d51
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
---
 jjb/vpp/vpp.yaml | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

(limited to 'jjb/vpp/vpp.yaml')

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 2f015d4b8..ccd636bc5 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -70,7 +70,6 @@
     project: 'vpp'
     make-parallel-jobs: '4'
     make-test-os: 'ubuntu-20.04'
-    archive-artifacts: '/tmp/vpp-failed-unittests/*/*'
     stream:
       - master:
           branch: 'master'
@@ -127,7 +126,6 @@
     project: 'vpp'
     make-parallel-jobs: '4'
     make-test-os: 'ubuntu-20.04'
-    archive-artifacts: '/tmp/vpp-failed-unittests/*/*'
     comment-trigger-value: 'debug-verify'
     stream:
       - master:
@@ -191,7 +189,6 @@
     project: 'vpp'
     make-parallel-jobs: '16'
     make-test-os: 'ubuntu-20.04'
-    archive-artifacts: '/tmp/vpp-failed-unittests/*/*'
     stream:
       - master:
           branch: 'master'
@@ -388,6 +385,8 @@
 
     # Please keep parameters in alphabetical order
     parameters:
+      - archive-artifacts-parameter:
+          artifacts: '{archive-artifacts}'
       - gerrit-parameter:
           branch: '{branch}'
       - gerrit-refspec-parameter:
@@ -398,8 +397,6 @@
           project: '{project}'
       - repo-name-parameter:
           repo-name: '{repo-stream-part}.ubuntu.bionic.main'
-      - workspace-archive-artifacts-parameter:
-          artifacts: '{archive-artifacts}'
 
     scm:
       - gerrit-trigger-scm:
@@ -505,6 +502,8 @@
 
     # Please keep parameters in alphabetical order
     parameters:
+      - archive-artifacts-parameter:
+          artifacts: '{archive-artifacts}'
       - gerrit-parameter:
           branch: '{branch}'
       - gerrit-refspec-parameter:
@@ -521,8 +520,6 @@
           repo-name: '{repo-stream-part}.{repo-os-part}'
       - stream-parameter:
           stream: '{stream}'
-      - workspace-archive-artifacts-parameter:
-          artifacts: '{archive-artifacts}'
 
     scm:
       - gerrit-trigger-scm:
@@ -573,6 +570,8 @@
 
     # Please keep parameters in alphabetical order
     parameters:
+      - archive-artifacts-parameter:
+          artifacts: '{archive-artifacts}'
       - gerrit-parameter:
           branch: '{branch}'
       - gerrit-refspec-parameter:
@@ -589,8 +588,6 @@
           repo-name: '{repo-stream-part}.ubuntu.bionic.main'
       - stream-parameter:
           stream: '{stream}'
-      - workspace-archive-artifacts-parameter:
-          artifacts: '{archive-artifacts}'
 
     scm:
       - gerrit-trigger-scm:
@@ -656,7 +653,7 @@
           repo-name: '{repo-stream-part}.{repo-os-part}'
       - stream-parameter:
           stream: '{stream}'
-      - workspace-archive-artifacts-parameter:
+      - archive-artifacts-parameter:
           artifacts: '{archive-artifacts}'
 
     scm:
@@ -737,7 +734,7 @@
           repo-name: '{repo-stream-part}.{repo-os-part}'
       - stream-parameter:
           stream: '{stream}'
-      - workspace-archive-artifacts-parameter:
+      - archive-artifacts-parameter:
           artifacts: '{archive-artifacts}'
 
     scm:
-- 
cgit 1.2.3-korg