Merge "CSIT-797 Add honeycomb parameter to hc2vpp-csit-verify job"

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

diff --git a/jjb/csit/csit-hc2vpp.yaml b/jjb/csit/csit-hc2vpp.yaml
index 7a929ae..be3a84c 100644 (file)
--- a/jjb/csit/csit-hc2vpp.yaml
+++ b/jjb/csit/csit-hc2vpp.yaml
@@ -2,18 +2,22 @@
     name: csit-hc2vpp
     description: 'jenkins jobs to verify Hc2vpp functional and performance tests.'
     jobs:
-        - 'csit-hc2vpp-verify-func-{os}'
-        - 'csit-hc2vpp-verify-perf'
+        - 'csit-hc2vpp-verify-func-{stream}-{os}'
+        - 'csit-hc2vpp-verify-perf-{stream}'
     project: 'csit'
     branch: 'master'
     build-artifact-num-to-keep: 10
-
     os:
         - ubuntu1604:
             repo-os-part: 'ubuntu.xenial.main'
+    stream:
+        - master:
+            branch: 'master'
+        - '1710':
+            branch: 'rls1710'
 
 - job-template:
-    name: 'csit-hc2vpp-verify-func-{os}'
+    name: 'csit-hc2vpp-verify-func-{stream}-{os}'
 
     project-type: freestyle
     node: '{os}-basebuild-4c-4g'
@@ -31,7 +35,9 @@
         - os-parameter:
             os: '{os}'
         - stream-parameter:
-            stream: 'master'
+            stream: '{stream}'
+        - gerrit-parameter:
+            branch: '{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -62,15 +68,17 @@
 
     publishers:
         - archive-artifacts:
-            artifacts: 'csit/report.html, csit/log.html, csit/output.xml, csit/honeycomb.log'
+            artifacts: 'archive/*.*'
             latest-only: false
+
         - email-notification:
             email-prefix: '[csit]'
+
         - robot-report:
-            output-path: 'csit'
+            output-path: 'archive'
 
 - job-template:
-    name: 'csit-hc2vpp-verify-perf'
+    name: 'csit-hc2vpp-verify-perf-{stream}'
 
     project-type: freestyle
     node: 'ubuntu1604-basebuild-4c-4g'
@@ -88,7 +96,9 @@
         - os-parameter:
             os: '{os}'
         - stream-parameter:
-            stream: 'master'
+            stream: '{stream}'
+        - gerrit-parameter:
+            branch: '{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -123,6 +133,9 @@
             artifacts: 'archive/*.*'
             latest-only: false
 
+        - email-notification:
+            email-prefix: '[csit]'
+
         - robot-report:
             output-path: 'archive'