Merge "Modify VPP archive artifacts"

2 files changed, 177 insertions, 129 deletions

diff --git a/jjb/vpp/docs.yaml b/jjb/vpp/docs.yaml
index 3b37a710b..2416e4247 100644
--- a/jjb/vpp/docs.yaml
+++ b/jjb/vpp/docs.yaml
@@ -22,6 +22,7 @@
       - '1904':
           branch: 'stable/1904'
           repo-stream-part: 'stable.1904'
+
     type:
       - short
       - long
@@ -54,6 +55,12 @@
     project-type: freestyle
     node: ubuntu1604-us
     concurrent: true
+    archive-artifacts: '**/build-root/docs/html/*'
+    allow-empty: 'true'
+    fingerprint: false
+    only-if-success: true
+    default-excludes: false
+
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -72,6 +79,10 @@
           maven-version: 'mvn33-new'
       - stream-parameter:
           stream: '{stream}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -105,12 +116,6 @@
           !include-raw-escape: include-raw-vpp-docs.sh
 
     publishers:
-        - archive:
-            artifacts: 'docs/_build/html/*'
-            allow-empty: 'true'
-            fingerprint: false
-            only-if-success: true
-            default-excludes: false
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
         - naginator:
@@ -124,6 +129,12 @@
     project-type: freestyle
     node: ubuntu1604-us
     concurrent: false
+    archive-artifacts: '**/build-root/docs/html/*'
+    allow-empty: 'true'
+    fingerprint: false
+    only-if-success: true
+    default-excludes: false
+
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -142,6 +153,9 @@
           maven-version: 'mvn33-new'
       - stream-parameter:
           stream: '{stream}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -191,12 +205,6 @@
           !include-raw-escape: include-raw-vpp-docs.sh
 
     publishers:
-      - archive:
-          artifacts: 'build-root/docs/html/*'
-          allow-empty: 'true'
-          fingerprint: false
-          only-if-success: true
-          default-excludes: false
       - fdio-infra-shiplogs:
           maven-version: 'mvn33-new'
       - naginator:
@@ -210,6 +218,11 @@
     project-type: freestyle
     node: ubuntu1604-us
     concurrent: true
+    archive-artifacts: '**/build-root/docs/html/*'
+    allow-empty: 'true'
+    fingerprint: false
+    only-if-success: true
+    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -228,6 +241,10 @@
           maven-version: 'mvn33-new'
       - stream-parameter:
           stream: '{stream}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -273,12 +290,6 @@
           !include-raw-escape: include-raw-vpp-sphinx-docs.sh
 
     publishers:
-        - archive:
-            artifacts: 'docs/_build/html/*'
-            allow-empty: 'true'
-            fingerprint: false
-            only-if-success: true
-            default-excludes: false
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
         - naginator:
@@ -292,6 +303,11 @@
     project-type: freestyle
     node: ubuntu1604-us
     concurrent: false
+    archive-artifacts: '**/build-root/docs/html/*'
+    allow-empty: 'true'
+    fingerprint: false
+    only-if-success: true
+    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -310,6 +326,10 @@
           maven-version: 'mvn33-new'
       - stream-parameter:
           stream: '{stream}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -350,12 +370,6 @@
           !include-raw-escape: include-raw-vpp-sphinx-docs.sh
 
     publishers:
-        - archive:
-            artifacts: 'docs/_build/html/*'
-            allow-empty: 'true'
-            fingerprint: false
-            only-if-success: true
-            default-excludes: false
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
         - naginator:
@@ -369,6 +383,11 @@
     project-type: freestyle
     node: ubuntu1604-us
     concurrent: true
+    archive-artifacts: '**/test/doc/build/html/*'
+    allow-empty: 'true'
+    fingerprint: false
+    only-if-success: true
+    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -387,6 +406,10 @@
           maven-version: 'mvn33-new'
       - stream-parameter:
           stream: '{stream}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -420,12 +443,6 @@
           !include-raw-escape: include-raw-vpp-make-test-docs.sh
 
     publishers:
-      - archive:
-          artifacts: 'test/doc/build/html/*'
-          allow-empty: 'true'
-          fingerprint: false
-          only-if-success: true
-          default-excludes: false
       - fdio-infra-shiplogs:
           maven-version: 'mvn33-new'
       - naginator:
@@ -439,6 +456,12 @@
     project-type: freestyle
     node: ubuntu1604-us
     concurrent: false
+    archive-artifacts: '**/test/doc/build/html/*'
+    allow-empty: 'true'
+    fingerprint: false
+    only-if-success: true
+    default-excludes: false
+
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -457,6 +480,10 @@
           maven-version: 'mvn33-new'
       - stream-parameter:
           stream: '{stream}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -506,12 +533,6 @@
           !include-raw-escape: include-raw-vpp-make-test-docs.sh
 
     publishers:
-      - archive:
-          artifacts: 'test/doc/build/html/*'
-          allow-empty: 'true'
-          fingerprint: false
-          only-if-success: true
-          default-excludes: false
       - fdio-infra-shiplogs:
           maven-version: 'mvn33-new'
       - naginator:
diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index fe157ec57..3dfd499e0 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -147,6 +147,17 @@
     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
+
     triggers:
       - gerrit-trigger-checkstyle:
           name: '{project}'
@@ -169,6 +180,10 @@
           repo-name: '{repo-stream-part}.{repo-os-part}'
       - stream-parameter:
           stream: '{stream}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -189,19 +204,8 @@
           - include-raw-vpp-build.sh
 
     publishers:
-      - archive:
-          artifacts: >
-            **/build-root/*.rpm,
-            **/build-root/*.deb,
-            **/dpdk/*.rpm,
-            **/dpdk/*.deb
-          allow-empty: 'true'
-          fingerprint: false
-          only-if-success: true
-          default-excludes: false
       - fdio-infra-shiplogs:
           maven-version: 'mvn33-new'
-          archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
       - naginator:
           rerun-unstable-builds: false
           max-failed-builds: 1
@@ -212,6 +216,15 @@
 
     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}'
@@ -234,6 +247,10 @@
           stream: '{stream}'
       - repo-name-parameter:
           repo-name: '{repo-stream-part}.{repo-os-part}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -284,16 +301,6 @@
           - include-raw-vpp-maven-push.sh
 
     publishers:
-      - archive:
-          artifacts: >
-            **/build-root/*.rpm,
-            **/build-root/*.deb,
-            **/dpdk/*.rpm,
-            **/dpdk/*.deb
-          allow-empty: 'true'
-          fingerprint: false
-          only-if-success: true
-          default-excludes: false
       - fdio-infra-shiplogs:
           maven-version: 'mvn33-new'
 
@@ -303,6 +310,15 @@
     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
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -321,6 +337,10 @@
           repo-name: '{repo-stream-part}.{repo-os-part}'
       - stream-parameter:
           stream: '{stream}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -346,16 +366,6 @@
           - include-raw-vpp-arm-build-no-test.sh
 
     publishers:
-      - archive:
-          artifacts: >
-            **/build-root/*.rpm,
-            **/build-root/*.deb,
-            **/dpdk/*.rpm,
-            **/dpdk/*.deb
-          allow-empty: 'true'
-          fingerprint: false
-          only-if-success: true
-          default-excludes: false
       - fdio-infra-shiplogs:
           maven-version: 'mvn33-new'
           archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
@@ -366,6 +376,15 @@
     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
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -384,6 +403,10 @@
           repo-name: '{repo-stream-part}.{repo-os-part}'
       - stream-parameter:
           stream: '{stream}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -410,16 +433,6 @@
           - include-raw-vpp-arm-build.sh
 
     publishers:
-      - archive:
-          artifacts: >
-            **/build-root/*.rpm,
-            **/build-root/*.deb,
-            **/dpdk/*.rpm,
-            **/dpdk/*.deb
-          allow-empty: 'true'
-          fingerprint: false
-          only-if-success: true
-          default-excludes: false
       - fdio-infra-shiplogs:
           maven-version: 'mvn33-new'
           archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
@@ -433,6 +446,15 @@
 
     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}'
@@ -455,6 +477,10 @@
           stream: '{stream}'
       - repo-name-parameter:
           repo-name: '{repo-stream-part}.{repo-os-part}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -503,16 +529,6 @@
           - ../scripts/packagecloud_push.sh
 
     publishers:
-      - archive:
-          artifacts: >
-            **/build-root/*.rpm,
-            **/build-root/*.deb,
-            **/dpdk/*.rpm,
-            **/dpdk/*.deb
-          allow-empty: 'true'
-          fingerprint: false
-          only-if-success: true
-          default-excludes: false
       - fdio-infra-shiplogs:
           maven-version: 'mvn33-new'
 
@@ -521,6 +537,15 @@
 
     project-type: freestyle
     node: '{os}arm-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}'
@@ -543,6 +568,10 @@
           stream: '{stream}'
       - repo-name-parameter:
           repo-name: '{repo-stream-part}.{repo-os-part}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -595,16 +624,6 @@
           - include-raw-vpp-maven-push.sh
 
     publishers:
-      - archive:
-          artifacts: >
-            **/build-root/*.rpm,
-            **/build-root/*.deb,
-            **/dpdk/*.rpm,
-            **/dpdk/*.deb
-          allow-empty: 'true'
-          fingerprint: false
-          only-if-success: true
-          default-excludes: false
       - fdio-infra-shiplogs:
           maven-version: 'mvn33-new'
 
@@ -710,6 +729,15 @@
     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
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -728,6 +756,10 @@
           repo-name: '{repo-stream-part}.{repo-os-part}'
       - stream-parameter:
           stream: '{stream}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -753,17 +785,6 @@
           - include-raw-vpp-build.sh
 
     publishers:
-      - archive:
-          artifacts: >
-            **/build-root/*.rpm,
-            **/build-root/*.deb,
-            **/dpdk/*.rpm,
-            **/dpdk/*.deb
-
-          allow-empty: 'true'
-          fingerprint: false
-          only-if-success: true
-          default-excludes: false
       - fdio-infra-shiplogs:
           maven-version: 'mvn33-new'
           archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
@@ -834,6 +855,15 @@
 
     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}'
@@ -856,6 +886,10 @@
           stream: '{stream}'
       - repo-name-parameter:
           repo-name: '{repo-stream-part}.{repo-os-part}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -908,16 +942,6 @@
           - include-raw-vpp-maven-push.sh
 
     publishers:
-      - archive:
-          artifacts: >
-            **/build-root/*.rpm,
-            **/build-root/*.deb,
-            **/dpdk/*.rpm,
-            **/dpdk/*.deb
-          allow-empty: 'true'
-          fingerprint: false
-          only-if-success: true
-          default-excludes: false
       - fdio-infra-shiplogs:
           maven-version: 'mvn33-new'
       - naginator:
@@ -931,6 +955,8 @@
     project-type: freestyle
     node: 'vpp-csit-device'
     concurrent: true
+    archive-artifacts: '**/csit_current/**/*.*'
+    latest-only: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -953,6 +979,10 @@
       - gerrit-csit-refspec-parameter
       - stream-parameter:
           stream: '{stream}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -978,11 +1008,6 @@
 
 
     publishers:
-      - archive-artifacts:
-          artifacts: >
-            **/csit_current/**/*.*
-          latest-only: false
-
       - robot-report:
           output-path: 'csit_current/'
 
@@ -995,6 +1020,10 @@
     project-type: freestyle
     node: '{os}-us'
     concurrent: true
+    archive-artifacts: >
+      **/csit_current/**/*.*
+      **/csit_parent/**/*.*
+    latest-only: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -1025,6 +1054,10 @@
           description: "Number of subsamples for BMRR tests."
       - stream-parameter:
           stream: '{stream}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -1050,12 +1083,6 @@
           - include-raw-vpp-csit-perf.sh
 
     publishers:
-      - archive-artifacts:
-          artifacts: >
-            **/csit_current/**/*.*,
-            **/csit_parent/**/*.*
-          latest-only: false
-
       - robot-report:
           output-path: 'csit_current/0/'