Merge "Configure Sweetcomb archive artifacts"

[ci-management.git] / jjb / csit / csit-vpp-device.yaml

diff --git a/jjb/csit/csit-vpp-device.yaml b/jjb/csit/csit-vpp-device.yaml
index 86412c1..0df3e1c 100644 (file)
--- a/jjb/csit/csit-vpp-device.yaml
+++ b/jjb/csit/csit-vpp-device.yaml
@@ -32,6 +32,9 @@
       - master:
           branch: 'master'
           branch-id: 'oper'
+      - '1904':
+          branch: 'rls1904'
+          branch-id: 'oper-rls1904'
     stream:
       - master:
           branch: 'master'
@@ -39,6 +42,12 @@
       - '1810':
           branch: 'rls1810'
           branch-id: 'oper-rls1810'
+      - '1901':
+          branch: 'rls1901'
+          branch-id: 'oper-rls1901'
+      - '1904':
+          branch: 'rls1904'
+          branch-id: 'oper-rls1904'
 
 - job-template:
     name: 'csit-vpp-device-{stream}-{os}-{topo}-{arch}'
@@ -199,15 +208,18 @@
           branch: '{branch}'
 
     builders:
+      - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
+      - inject:
+          properties-file: variables.prop
       - shell:
           !include-raw-escape: jjb/csit/include-raw-csit-device-semiweekly.sh
 
     publishers:
       - archive-artifacts:
-          artifacts: 'archive/*.*'
+          artifacts: 'csit/archive/*.*'
           latest-only: false
       - robot:
-          output-path: archive
+          output-path: 'csit/archive'
           other-files:
             - '*.*'
       - fdio-infra-shiplogs: