fix prebuild script in hc2vpp-csit-verify jobs

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

diff --git a/jjb/hc2vpp/hc2vpp-csit.yaml b/jjb/hc2vpp/hc2vpp-csit.yaml
index 20c230f..2006984 100644 (file)
--- a/jjb/hc2vpp/hc2vpp-csit.yaml
+++ b/jjb/hc2vpp/hc2vpp-csit.yaml
@@ -21,11 +21,14 @@
         - '1707':
             branch: 'stable/1707'
             repo-stream-part: 'stable.1707'
+        - '1710':
+            branch: 'stable/1710'
+            repo-stream-part: 'stable.1710'
     os:
         - ubuntu1604:
             repo-os-part: 'ubuntu.xenial.main'
     odl:
-        - boron
+        - carbon
 
 - project:
     name: csit-hc2vpp-perf
@@ -85,13 +88,13 @@
 
     publishers:
         - archive-artifacts:
-            artifacts: 'csit/report.html, csit/log.html, csit/output.xml, csit/honeycomb.log'
+            artifacts: 'csit/archive/*.*'
             latest-only: false
         - email-notification:
             email-prefix: '[hc2vpp]'
 
         - robot-report:
-            output-path: 'csit'
+            output-path: 'csit/archive'
 
 - job-template:
     name: 'hc2vpp-csit-verify-{stream}-{os}'
@@ -152,6 +155,9 @@
                 notbuilt: true
 
     prebuilders:
+        - provide-maven-settings:
+            settings-file: 'honeycomb-settings'
+            global-settings-file: 'global-settings'
         - shell:
             !include-raw-escape: include-raw-hc2vpp-csit-verify-prebuild.sh
 
@@ -171,13 +177,13 @@
 
     publishers:
         - archive-artifacts:
-            artifacts: 'csit/report.html, csit/log.html, csit/output.xml, csit/honeycomb.log'
+            artifacts: 'csit/archive/*.*'
             latest-only: false
         - email-notification:
             email-prefix: '[hc2vpp]'
 
         - robot-report:
-            output-path: 'csit'
+            output-path: 'csit/archive'
 
 - job-template:
     name: 'hc2vpp-csit-integration-odl-{odl}-{stream}-{os}'
@@ -222,13 +228,13 @@
 
     publishers:
         - archive-artifacts:
-            artifacts: 'csit/report.html, csit/log.html, csit/output.xml, csit/honeycomb.log'
+            artifacts: 'csit/archive/*.*'
             latest-only: false
         - email-notification:
             email-prefix: '[hc2vpp]'
 
         - robot-report:
-            output-path: 'csit'
+            output-path: 'csit/archive'
 
 - job-template:
     name: 'hc2vpp-csit-verify-odl-{odl}-{stream}-{os}'
@@ -289,6 +295,9 @@
                 notbuilt: true
 
     prebuilders:
+        - provide-maven-settings:
+            settings-file: 'honeycomb-settings'
+            global-settings-file: 'global-settings'
         - shell:
             !include-raw-escape: include-raw-hc2vpp-csit-verify-prebuild.sh
 
@@ -308,13 +317,13 @@
 
     publishers:
         - archive-artifacts:
-            artifacts: 'csit/report.html, csit/log.html, csit/output.xml, csit/honeycomb.log'
+            artifacts: 'csit/archive/*.*'
             latest-only: false
         - email-notification:
             email-prefix: '[hc2vpp]'
 
         - robot-report:
-            output-path: 'csit'
+            output-path: 'csit/archive'
 
 - job-template:
     name: 'hc2vpp-csit-perf-{stream}-{os}'