Merge "Modify CSIT archive artifacts"

diff --git a/jjb/csit/csit-hc2vpp.yaml b/jjb/csit/csit-hc2vpp.yaml
index a3ae383..aeead71 100644 (file)
--- a/jjb/csit/csit-hc2vpp.yaml
+++ b/jjb/csit/csit-hc2vpp.yaml
@@ -33,6 +33,8 @@
     project-type: freestyle
     node: '{os}-basebuild-4c-4g'
     concurrent: true
+    archive-artifacts: 'archive/*.*'
+    latest-only: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -49,6 +51,10 @@
           stream: '{stream}'
       - gerrit-parameter:
           branch: '{branch}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -71,10 +77,6 @@
           !include-raw-escape: include-raw-csit-hc2vpp-verify-func.sh
 
     publishers:
-      - archive-artifacts:
-          artifacts: 'archive/*.*'
-          latest-only: false
-
       - email-notification:
           email-prefix: '[csit]'
 
@@ -90,6 +92,8 @@
     project-type: freestyle
     node: '{os}-basebuild-4c-4g'
     concurrent: false
+    archive-artifacts: 'archive/*.*'
+    latest-only: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -106,6 +110,10 @@
           stream: '{stream}'
       - gerrit-parameter:
           branch: '{branch}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -128,10 +136,6 @@
           !include-raw-escape: include-raw-csit-hc2vpp-verify-perf.sh
 
     publishers:
-      - archive-artifacts:
-          artifacts: 'archive/*.*'
-          latest-only: false
-
       - email-notification:
           email-prefix: '[csit]'
 

diff --git a/jjb/csit/csit-tox.yaml b/jjb/csit/csit-tox.yaml
index 2d6bcb7..8381662 100644 (file)
--- a/jjb/csit/csit-tox.yaml
+++ b/jjb/csit/csit-tox.yaml
@@ -21,6 +21,9 @@
     project-type: freestyle
     node: ubuntu1804-us
     concurrent: true
+    archive-artifacts: '*.log'
+    latest-only: false
+
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -34,6 +37,10 @@
       - gerrit-parameter:
           branch: '{branch}'
       - gerrit-refspec-parameter
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -55,9 +62,6 @@
           ./resources/libraries/bash/entry/tox.sh
 
     publishers:
-      - archive-artifacts:
-          artifacts: '*.log'
-          latest-only: false
       # TODO: Remove this when a voting pylint difference checker
       # with nice enough output is implemented.
       - violations:

diff --git a/jjb/csit/csit-vpp-device.yaml b/jjb/csit/csit-vpp-device.yaml
index 0df3e1c..28e4bb5 100644 (file)
--- a/jjb/csit/csit-vpp-device.yaml
+++ b/jjb/csit/csit-vpp-device.yaml
@@ -1,3 +1,4 @@
+---
 # Copyright (c) 2019 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -84,6 +85,8 @@
     project-type: freestyle
     node: 'vpp-csit-device'
     concurrent: true
+    archive-artifacts: 'archive/*.*'
+    latest-only: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -101,6 +104,10 @@
       - gerrit-refspec-parameter
       - gerrit-event-type-parameter
       - gerrit-event-comment-text-parameter
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -139,9 +146,6 @@
           !include-raw-escape: jjb/csit/include-raw-csit-device-verify.sh
 
     publishers:
-      - archive-artifacts:
-          artifacts: 'archive/*.*'
-          latest-only: false
       - robot:
           output-path: archive
           other-files:
@@ -180,6 +184,8 @@
     project-type: freestyle
     node: 'vpp-csit-device'
     concurrent: false
+    archive-artifacts: 'csit/archive/*.*'
+    latest-only: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -194,6 +200,10 @@
           branch: '{branch}'
       - os-parameter:
           os: '{os}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     wrappers:
       - fdio-infra-wrappers-non-activity-timeout:
@@ -215,9 +225,6 @@
           !include-raw-escape: jjb/csit/include-raw-csit-device-semiweekly.sh
 
     publishers:
-      - archive-artifacts:
-          artifacts: 'csit/archive/*.*'
-          latest-only: false
       - robot:
           output-path: 'csit/archive'
           other-files:
@@ -255,6 +262,8 @@
     project-type: freestyle
     node: 'vpp-csit-device'
     concurrent: false
+    archive-artifacts: 'archive/*.*'
+    latest-only: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -269,6 +278,10 @@
           branch: '{branch}'
       - os-parameter:
           os: '{os}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - git-scm:
@@ -292,9 +305,6 @@
           !include-raw-escape: jjb/csit/include-raw-csit-device-verify.sh
 
     publishers:
-      - archive-artifacts:
-          artifacts: 'archive/*.*'
-          latest-only: false
       - robot:
           output-path: archive
           other-files:

diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index da8c30f..c38b771 100644 (file)
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -113,6 +113,11 @@
     project-type: freestyle
     node: '{os}-basebuild-4c-4g'
     concurrent: true
+    archive-artifacts: >
+      **/csit/report.html
+      **/csit/log.html
+      **/csit/output.xml
+    latest-only: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -125,6 +130,10 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -146,13 +155,6 @@
           !include-raw-escape: include-raw-csit-vpp-functional-virl.sh
 
     publishers:
-      - archive-artifacts:
-          artifacts: >
-            **/csit/report.html,
-            **/csit/log.html,
-            **/csit/output.xml
-          latest-only: false
-
       - robot-report:
           output-path: ''
 
@@ -199,6 +201,9 @@
     project-type: freestyle
     node: '{perf-executor}'
     concurrent: true
+    archive-artifacts: 'archive/*.*'
+    latest-only: false
+
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -211,6 +216,10 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -245,10 +254,6 @@
           !include-raw-escape: jjb/csit/include-raw-csit-perf-verify.sh
 
     publishers:
-      - archive-artifacts:
-          artifacts: 'archive/*.*'
-          latest-only: false
-
       - robot:
           output-path: archive
           other-files:
@@ -308,6 +313,9 @@
     #   image so we can move this executor to ubuntu1804-us
     node: 'ubuntu1804-basebuild-4c-4g'
     concurrent: true
+    archive-artifacts: 'archive/*.*'
+    latest-only: false
+
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -323,6 +331,10 @@
       - gerrit-refspec-parameter
       - gerrit-event-type-parameter
       - gerrit-event-comment-text-parameter
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -357,10 +369,6 @@
           !include-raw-escape: jjb/csit/include-raw-csit-perf-verify.sh
 
     publishers:
-      - archive-artifacts:
-          artifacts: 'archive/*.*'
-          latest-only: false
-
       - robot:
           output-path: archive
           other-files:
@@ -379,6 +387,11 @@
     project-type: freestyle
     node: '{os}-basebuild-4c-4g'
     concurrent: false
+    archive-artifacts: >
+      **/csit/report.html
+      **/csit/log.html
+      **/csit/output.xml
+    latest-only: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -391,6 +404,10 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - git-scm:
@@ -414,13 +431,6 @@
           !include-raw-escape: jjb/csit/include-raw-csit-vpp-verify-weekly.sh
 
     publishers:
-      - archive-artifacts:
-          artifacts: >
-            **/csit/report.html,
-            **/csit/log.html,
-            **/csit/output.xml
-          latest-only: false
-
       - robot-report:
           output-path: ''
 
@@ -436,6 +446,8 @@
     project-type: freestyle
     node: '{os}-basebuild-4c-4g'
     concurrent: false
+    archive-artifacts: 'csit/archive/*.*'
+    latest-only: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -448,6 +460,10 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     wrappers:
       - fdio-infra-wrappers-non-activity-timeout:
@@ -471,10 +487,6 @@
           # yamllint enable rule:line-length
 
     publishers:
-      - archive-artifacts:
-          artifacts: 'csit/archive/*.*'
-          latest-only: false
-
       - robot-report:
           output-path: 'csit/archive'
 
@@ -487,6 +499,11 @@
     project-type: freestyle
     node: '{docs-executor}'
     concurrent: true
+    archive-artifacts: 'resources/tools/doc_gen/csit.docs.tar.gz'
+    allow-empty: 'true'
+    fingerprint: false
+    only-if-success: true
+    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -501,6 +518,10 @@
           branch: '{branch}'
       - maven-exec:
           maven-version: 'mvn33-new'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -532,13 +553,6 @@
           !include-raw-escape: include-raw-csit-docs.sh
 
     publishers:
-      - archive:
-          artifacts: 'resources/tools/doc_gen/csit.docs.tar.gz'
-          allow-empty: 'true'
-          fingerprint: false
-          only-if-success: true
-          default-excludes: false
-
       - fdio-infra-shiplogs:
           maven-version: 'mvn33-new'
 
@@ -548,6 +562,11 @@
     project-type: freestyle
     node: '{docs-executor}'
     concurrent: true
+    archive-artifacts: 'resources/tools/doc_gen/csit.docs.tar.gz'
+    allow-empty: 'true'
+    fingerprint: false
+    only-if-success: true
+    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -562,6 +581,10 @@
           branch: '{branch}'
       - maven-exec:
           maven-version: 'mvn33-new'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -609,13 +632,6 @@
           !include-raw-escape: include-raw-csit-docs.sh
 
     publishers:
-      - archive:
-          artifacts: 'resources/tools/doc_gen/csit.docs.tar.gz'
-          allow-empty: 'true'
-          fingerprint: false
-          only-if-success: true
-          default-excludes: false
-
       - fdio-infra-shiplogs:
           maven-version: 'mvn33-new'
 
@@ -625,6 +641,11 @@
     project-type: freestyle
     node: 'ubuntu1604-basebuild-8c-32g'
     concurrent: false
+    archive-artifacts: 'resources/tools/presentation/csit.report.tar.gz'
+    allow-empty: 'true'
+    fingerprint: false
+    only-if-success: true
+    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -639,6 +660,10 @@
           branch: '{branch}'
       - maven-exec:
           maven-version: 'mvn33-new'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -683,13 +708,6 @@
           !include-raw-escape: include-raw-csit-report.sh
 
     publishers:
-      - archive:
-          artifacts: 'resources/tools/presentation/csit.report.tar.gz'
-          allow-empty: 'true'
-          fingerprint: false
-          only-if-success: true
-          default-excludes: false
-
       - fdio-infra-shiplogs:
           maven-version: 'mvn33-new'
 
@@ -699,6 +717,11 @@
     project-type: freestyle
     node: 'ubuntu1604-basebuild-8c-32g'
     concurrent: false
+    archive-artifacts: 'resources/tools/presentation/csit.report.tar.gz'
+    allow-empty: 'true'
+    fingerprint: false
+    only-if-success: true
+    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -713,6 +736,10 @@
           branch: 'rls1901_2'
       - maven-exec:
           maven-version: 'mvn33-new'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -757,13 +784,6 @@
           !include-raw-escape: include-raw-csit-report.sh
 
     publishers:
-      - archive:
-          artifacts: 'resources/tools/presentation/csit.report.tar.gz'
-          allow-empty: 'true'
-          fingerprint: false
-          only-if-success: true
-          default-excludes: false
-
       - fdio-infra-shiplogs:
           maven-version: 'mvn33-new'
 
@@ -773,6 +793,11 @@
     project-type: freestyle
     node: 'ubuntu1604-basebuild-8c-32g'
     concurrent: false
+    archive-artifacts: 'resources/tools/presentation/csit.report.tar.gz'
+    allow-empty: 'true'
+    fingerprint: false
+    only-if-success: true
+    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -787,6 +812,10 @@
           branch: 'rls1904_1'
       - maven-exec:
           maven-version: 'mvn33-new'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -831,13 +860,6 @@
           !include-raw-escape: include-raw-csit-report.sh
 
     publishers:
-      - archive:
-          artifacts: 'resources/tools/presentation/csit.report.tar.gz'
-          allow-empty: 'true'
-          fingerprint: false
-          only-if-success: true
-          default-excludes: false
-
       - fdio-infra-shiplogs:
           maven-version: 'mvn33-new'
 
@@ -931,6 +953,8 @@
     project-type: freestyle
     node: '{perf-executor}'
     concurrent: false
+    archive-artifacts: 'csit/archive/*.*'
+    latest-only: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -943,6 +967,10 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     wrappers:
       - fdio-infra-wrappers-non-activity-timeout:
@@ -959,10 +987,6 @@
           !include-raw-escape: jjb/csit/include-raw-csit-perf-timed.sh
 
     publishers:
-      - archive-artifacts:
-          artifacts: 'csit/archive/*.*'
-          latest-only: false
-
       - robot:
           output-path: 'csit/archive'
           other-files:
@@ -994,6 +1018,8 @@
     project-type: freestyle
     node: '{perf-executor}'
     concurrent: false
+    archive-artifacts: 'csit/archive/*.*'
+    latest-only: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -1006,6 +1032,10 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     wrappers:
       - fdio-infra-wrappers-non-activity-timeout:
@@ -1022,10 +1052,6 @@
           !include-raw-escape: jjb/csit/include-raw-csit-perf-timed.sh
 
     publishers:
-      - archive-artifacts:
-          artifacts: 'csit/archive/*.*'
-          latest-only: false
-
       - robot:
           output-path: 'csit/archive'
           other-files:
@@ -1057,6 +1083,8 @@
     project-type: freestyle
     node: '{perf-executor}'
     concurrent: false
+    archive-artifacts: 'csit/archive/*.*'
+    latest-only: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -1069,6 +1097,10 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     wrappers:
       - fdio-infra-wrappers-non-activity-timeout:
@@ -1085,10 +1117,6 @@
           !include-raw-escape: jjb/csit/include-raw-csit-perf-timed.sh
 
     publishers:
-      - archive-artifacts:
-          artifacts: 'csit/archive/*.*'
-          latest-only: false
-
       - robot:
           output-path: 'csit/archive'
           other-files:
@@ -1121,6 +1149,8 @@
     project-type: freestyle
     node: '{perf-executor}'
     concurrent: false
+    archive-artifacts: 'csit/archive/*.*'
+    latest-only: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -1133,6 +1163,10 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     wrappers:
       - fdio-infra-wrappers-non-activity-timeout:
@@ -1149,10 +1183,6 @@
           !include-raw-escape: jjb/csit/include-raw-csit-perf-timed.sh
 
     publishers:
-      - archive-artifacts:
-          artifacts: 'csit/archive/*.*'
-          latest-only: false
-
       - robot:
           output-path: 'csit/archive'
           other-files:
@@ -1185,6 +1215,8 @@
     project-type: freestyle
     node: '{perf-executor}'
     concurrent: false
+    archive-artifacts: 'csit/archive/*.*'
+    latest-only: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -1197,6 +1229,10 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     wrappers:
       - fdio-infra-wrappers-non-activity-timeout:
@@ -1213,10 +1249,6 @@
           !include-raw-escape: jjb/csit/include-raw-csit-perf-timed.sh
 
     publishers:
-      - archive-artifacts:
-          artifacts: 'csit/archive/*.*'
-          latest-only: false
-
       - robot:
           output-path: 'csit/archive'
           other-files:
@@ -1249,6 +1281,8 @@
     project-type: freestyle
     node: '{perf-executor}'
     concurrent: false
+    archive-artifacts: 'csit/archive/*.*'
+    latest-only: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -1261,6 +1295,10 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     wrappers:
       - fdio-infra-wrappers-non-activity-timeout:
@@ -1277,10 +1315,6 @@
           !include-raw-escape: jjb/csit/include-raw-csit-perf-timed.sh
 
     publishers:
-      - archive-artifacts:
-          artifacts: 'csit/archive/*.*'
-          latest-only: false
-
       - robot:
           output-path: 'csit/archive'
           other-files:
@@ -1313,6 +1347,8 @@
     project-type: freestyle
     node: '{perf-executor}'
     concurrent: false
+    archive-artifacts: 'csit/archive/*.*'
+    latest-only: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -1325,6 +1361,10 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     wrappers:
       - fdio-infra-wrappers-non-activity-timeout:
@@ -1341,10 +1381,6 @@
           !include-raw-escape: jjb/csit/include-raw-csit-perf-timed.sh
 
     publishers:
-      - archive-artifacts:
-          artifacts: 'csit/archive/*.*'
-          latest-only: false
-
       - robot:
           output-path: 'csit/archive'
           other-files:
@@ -1377,6 +1413,8 @@
     project-type: freestyle
     node: '{perf-executor}'
     concurrent: false
+    archive-artifacts: 'csit/archive/*.*'
+    latest-only: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -1389,6 +1427,10 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     wrappers:
       - fdio-infra-wrappers-non-activity-timeout:
@@ -1405,10 +1447,6 @@
           !include-raw-escape: jjb/csit/include-raw-csit-perf-timed.sh
 
     publishers:
-      - archive-artifacts:
-          artifacts: 'csit/archive/*.*'
-          latest-only: false
-
       - robot:
           output-path: 'csit/archive'
           other-files:
@@ -1441,6 +1479,8 @@
     project-type: freestyle
     node: '{perf-executor}'
     concurrent: false
+    archive-artifacts: 'csit/archive/*.*'
+    latest-only: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -1453,6 +1493,10 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     wrappers:
       - fdio-infra-wrappers-non-activity-timeout:
@@ -1469,10 +1513,6 @@
           !include-raw-escape: jjb/csit/include-raw-csit-perf-timed.sh
 
     publishers:
-      - archive-artifacts:
-          artifacts: 'csit/archive/*.*'
-          latest-only: false
-
       - robot:
           output-path: 'csit/archive'
           other-files:
@@ -1505,6 +1545,8 @@
     project-type: freestyle
     node: '{perf-executor}'
     concurrent: false
+    archive-artifacts: 'csit/archive/*.*'
+    latest-only: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -1517,6 +1559,10 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     wrappers:
       - fdio-infra-wrappers-non-activity-timeout:
@@ -1533,10 +1579,6 @@
           !include-raw-escape: jjb/csit/include-raw-csit-perf-timed.sh
 
     publishers:
-      - archive-artifacts:
-          artifacts: 'csit/archive/*.*'
-          latest-only: false
-
       - robot:
           output-path: 'csit/archive'
           other-files:
@@ -1591,6 +1633,8 @@
     project-type: freestyle
     node: '{perf-executor}'
     concurrent: true
+    archive-artifacts: 'archive/*.*'
+    latest-only: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -1606,6 +1650,10 @@
       - gerrit-refspec-parameter
       - gerrit-event-type-parameter
       - gerrit-event-comment-text-parameter
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -1640,10 +1688,6 @@
           !include-raw-escape: jjb/csit/include-raw-csit-perf-verify.sh
 
     publishers:
-      - archive-artifacts:
-          artifacts: 'archive/*.*'
-          latest-only: false
-
       - robot:
           output-path: archive
           other-files:
@@ -1658,6 +1702,9 @@
     project-type: freestyle
     node: 'ubuntu1604-basebuild-4c-4g'
     concurrent: true
+    archive-artifacts: 'archive/*.*'
+    latest-only: false
+
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -1674,6 +1721,10 @@
           os: 'ubuntu1604'
       - stream-parameter:
           stream: '{stream}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -1696,10 +1747,6 @@
           !include-raw-escape: jjb/csit/include-raw-csit-nsh_sfc-perf-hw.sh
 
     publishers:
-      - archive-artifacts:
-          artifacts: 'archive/*.*'
-          latest-only: false
-
       - robot-report:
           output-path: 'archive'
 
@@ -1712,6 +1759,9 @@
     project-type: freestyle
     node: '{os}-basebuild-4c-4g'
     concurrent: true
+    archive-artifacts: 'archive/*.*'
+    latest-only: false
+
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -1728,6 +1778,10 @@
           os: '{os}'
       - stream-parameter:
           stream: '{stream}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -1750,10 +1804,6 @@
           !include-raw-escape: include-raw-csit-nsh_sfc-functional-virl.sh
 
     publishers:
-      - archive-artifacts:
-          artifacts: 'archive/*.*'
-          latest-only: false
-
       - robot-report:
           output-path: 'archive'
 
@@ -1766,6 +1816,8 @@
     project-type: freestyle
     node: '{os}-basebuild-4c-4g'
     concurrent: true
+    archive-artifacts: 'archive/*.*'
+    latest-only: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -1780,6 +1832,10 @@
           branch: '{branch}'
       - os-parameter:
           os: '{os}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -1802,10 +1858,6 @@
           !include-raw-escape: include-raw-csit-tldk-functional-virl.sh
 
     publishers:
-      - archive-artifacts:
-          artifacts: 'archive/*.*'
-          latest-only: false
-
       - robot-report:
           output-path: 'archive'
 
@@ -1818,6 +1870,8 @@
     project-type: freestyle
     node: 'ubuntu1604-basebuild-4c-4g'
     concurrent: true
+    archive-artifacts: 'archive/*.*'
+    latest-only: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -1830,6 +1884,10 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -1852,10 +1910,6 @@
           !include-raw-escape: include-raw-csit-dmm-functional-virl.sh
 
     publishers:
-      - archive-artifacts:
-          artifacts: 'archive/*.*'
-          latest-only: false
-
       - robot-report:
           output-path: ''