Merge "Enable log shipping on all hc2vpp jobs"

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

diff --git a/jjb/hc2vpp/csit-hc2vpp.yaml b/jjb/hc2vpp/csit-hc2vpp.yaml
index aa7cbab..94e4699 100644 (file)
--- a/jjb/hc2vpp/csit-hc2vpp.yaml
+++ b/jjb/hc2vpp/csit-hc2vpp.yaml
@@ -21,7 +21,7 @@
     name: 'hc2vpp-csit-integration-{stream}-{os}'
 
     project-type: freestyle
-    node: verify-{os}
+    node: 'ubuntu1604-basebuild-4c-4g'
     concurrent: true
 
     logrotate:
@@ -64,19 +64,19 @@
 
     publishers:
         - archive-artifacts:
-            artifacts: 'report.html, log.html, output.xml, /var/log/honeycomb/honeycomb.log'
+            artifacts: 'csit/report.html, csit/log.html, csit/output.xml, csit/honeycomb.log'
             latest-only: false
         - email-notification:
             email-prefix: '[hc2vpp]'
 
         - robot-report:
-            output-path: ''
+            output-path: 'csit'
 
 - job-template:
     name: 'hc2vpp-csit-verify-{stream}-{os}'
 
     project-type: maven
-    node: verify-{os}
+    node: 'ubuntu1604-basebuild-4c-4g'
     concurrent: true
 
     logrotate:
@@ -93,7 +93,9 @@
         - os-parameter:
             os: '{os}'
         - maven-project-parameter:
-            maven: 'mvn33'
+            maven: 'mvn33-new'
+        - maven-exec:
+            maven-version: 'mvn33-new'
 
     scm:
         - gerrit-trigger-scm:
@@ -111,7 +113,7 @@
             server-name: 'Primary'
             trigger-on:
                 - comment-added-contains-event:
-                    comment-contains-value: 'csit-verify'
+                    comment-contains-value: 'verify-csit'
             projects:
               - project-compare-type: 'ANT'
                 project-pattern: '{project}'
@@ -131,7 +133,7 @@
             !include-raw-escape: include-raw-hc2vpp-csit-verify-prebuild.sh
 
     maven:
-        maven-name: 'mvn33'
+        maven-name: 'mvn33-new'
         root-pom: 'pom.xml'
         goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmaven.site.skip={skip-site} site -Dmaven.site.deploy.skip={skip-site} -DskipTests'
         maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
@@ -148,10 +150,10 @@
 
     publishers:
         - archive-artifacts:
-            artifacts: 'report.html, log.html, output.xml, /var/log/honeycomb/honeycomb.log'
+            artifacts: 'csit/report.html, csit/log.html, csit/output.xml, csit/honeycomb.log'
             latest-only: false
         - email-notification:
             email-prefix: '[hc2vpp]'
 
         - robot-report:
-            output-path: ''
+            output-path: 'csit'