Merge "Configure Sweetcomb archive artifacts"

[ci-management.git] / jjb / csit / csit-hc2vpp.yaml

diff --git a/jjb/csit/csit-hc2vpp.yaml b/jjb/csit/csit-hc2vpp.yaml
index a354b7f..a3ae383 100644 (file)
--- a/jjb/csit/csit-hc2vpp.yaml
+++ b/jjb/csit/csit-hc2vpp.yaml
@@ -4,23 +4,28 @@
     description: 'jenkins jobs verify Hc2vpp functional and performance tests'
     jobs:
       - 'csit-hc2vpp-verify-func-{stream}-{os}'
-      - 'csit-hc2vpp-verify-perf-{stream}'
+      - 'csit-hc2vpp-verify-perf-{stream}-{os}'
     project: 'csit'
     branch: 'master'
     build-artifact-num-to-keep: 10
-    os: 'ubuntu1604'
-    repo-os-part: 'ubuntu.xenial.main'
+    os:
+      - ubuntu1804:
+          repo-os-part: 'ubuntu.bionic.main'
+      - ubuntu1604:
+          repo-os-part: 'ubuntu.xenial.main'
 
     stream:
       - master:
           branch: 'master'
-      - '1804':
-          branch: 'rls1804'
-      - '1807':
-          branch: 'rls1807'
       - '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-hc2vpp-verify-func-{stream}-{os}'
@@ -77,13 +82,13 @@
           output-path: 'archive'
 
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
 
 - job-template:
-    name: 'csit-hc2vpp-verify-perf-{stream}'
+    name: 'csit-hc2vpp-verify-perf-{stream}-{os}'
 
     project-type: freestyle
-    node: 'ubuntu1604-basebuild-4c-4g'
+    node: '{os}-basebuild-4c-4g'
     concurrent: false
 
     build-discarder:
@@ -134,4 +139,4 @@
           output-path: 'archive'
 
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'