Merge "Update archive items path for csit-hc2vpp jobs"

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

diff --git a/jjb/csit/csit-hc2vpp.yaml b/jjb/csit/csit-hc2vpp.yaml
index f86dc35..7ef5c74 100644 (file)
--- a/jjb/csit/csit-hc2vpp.yaml
+++ b/jjb/csit/csit-hc2vpp.yaml
@@ -2,7 +2,7 @@
     name: csit-hc2vpp
     description: 'jenkins jobs to verify Hc2vpp functional and performance tests.'
     jobs:
-        - 'csit-hc2vpp-verify-func'
+        - 'csit-hc2vpp-verify-func-{os}'
         - 'csit-hc2vpp-verify-perf'
     project: 'csit'
     branch: 'master'
@@ -13,7 +13,7 @@
             repo-os-part: 'ubuntu.xenial.main'
 
 - job-template:
-    name: 'csit-hc2vpp-verify-func'
+    name: 'csit-hc2vpp-verify-func-{os}'
 
     project-type: freestyle
     node: '{os}-basebuild-4c-4g'
@@ -62,18 +62,20 @@
 
     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'
 
     project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
+    node: 'ubuntu1604-basebuild-4c-4g'
     concurrent: false
 
     logrotate:
@@ -120,11 +122,14 @@
 
     publishers:
         - archive-artifacts:
-            artifacts: 'csit/archive/*.*'
+            artifacts: 'archive/*.*'
             latest-only: false
 
+        - email-notification:
+            email-prefix: '[csit]'
+
         - robot-report:
-            output-path: 'csit/archive'
+            output-path: 'archive'
 
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'