X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fcsit%2Fcsit.yaml;h=e3fdbe8a9ab2c54cf2d127f9459272fd17e19a68;hb=1e7cb6f179b3dea5cc01c9d90b4964e47e7f3713;hp=4354bb00f9eae30e923bbecbc964bb11b0c9c879;hpb=c84db18689a85fd708e05bbd8bfc8cd7819778c5;p=ci-management.git

diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index 4354bb00f..e3fdbe8a9 100644
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -38,7 +38,7 @@
     name: 'csit-vpp-functional-{stream}-virl'
 
     project-type: freestyle
-    node: verify-ubuntu1604
+    node: ubuntu1604-basebuild-4c-4g
     concurrent: true
 
     logrotate:
@@ -80,12 +80,14 @@
         - robot-report:
             output-path: ''
 
+        - fdio-infra-shiplogs:
+            maven-version: 'mvn33-new'
 
 - job-template:
     name: 'csit-vpp-perf-{stream}-{type}'
 
     project-type: freestyle
-    node: verify-ubuntu1604
+    node: ubuntu1604-basebuild-4c-4g
     concurrent: false
 
     logrotate:
@@ -264,13 +266,15 @@
                     xpath-type: 'nodeset'
                     xpath: '//*[@framesize="78" and contains(@tags,"PDR") and @workerthreads="4"]'
 
+        - fdio-infra-shiplogs:
+            maven-version: 'mvn33-new'
 
 - job-template:
     name: 'csit-vpp-verify-{stream_timed}-weekly'
     description: 'Purpose of this job is to validate CSIT code of corresponding branch against verified vpp build from corresponding branch and create corresponding operational branch in case of success.'
 
     project-type: freestyle
-    node: verify-ubuntu1604
+    node: ubuntu1604-basebuild-4c-4g
     concurrent: false
 
     logrotate:
@@ -323,13 +327,15 @@
                     remote: origin
                     name: 'refs/heads/{branch-id}-$DATE'
 
+        - fdio-infra-shiplogs:
+            maven-version: 'mvn33-new'
 
 - job-template:
     name: 'csit-vpp-verify-{stream_timed}-semiweekly'
     description: 'Purpose of this job is to validate latest vpp build from corresponding branch stored in nexus against verified CSIT codebase of corresponding branch.'
 
     project-type: freestyle
-    node: verify-ubuntu1604
+    node: ubuntu1604-basebuild-4c-4g
     concurrent: false
 
     logrotate:
@@ -371,13 +377,15 @@
         - robot-report:
             output-path: 'csit/archive'
 
+        - fdio-infra-shiplogs:
+            maven-version: 'mvn33-new'
 
 - job-template:
     name: 'csit-vpp-verify-perf-master-nightly-all'
     description: 'Purpose of this job is to validate latest vpp build from corresponding branch stored in nexus against verified CSIT codebase of corresponding branch.'
 
     project-type: freestyle
-    node: verify-ubuntu1604
+    node: ubuntu1604-basebuild-4c-4g
     concurrent: false
 
     logrotate:
@@ -548,12 +556,14 @@
                     xpath-type: 'nodeset'
                     xpath: '//*[@framesize="78" and contains(@tags,"PDR") and @workerthreads="4"]'
 
+        - fdio-infra-shiplogs:
+            maven-version: 'mvn33-new'
 
 - job-template:
     name: 'csit-docs-verify-{stream}'
 
     project-type: freestyle
-    node: 'verify-ubuntu1604'
+    node: 'ubuntu1604-basebuild-4c-4g'
     concurrent: true
 
     logrotate:
@@ -567,6 +577,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - maven-exec:
+            maven-version: 'mvn33-new'
 
     scm:
         - gerrit-trigger-scm:
@@ -587,7 +599,7 @@
 
     builders:
         - maven-target:
-            maven-version: 'mvn33'
+            maven-version: 'mvn33-new'
             goals: '--version'
             settings: 'csit-settings'
             settings-type: cfp
@@ -607,12 +619,14 @@
             only-if-success: true
             default-excludes: false
 
+        - fdio-infra-shiplogs:
+            maven-version: 'mvn33-new'
 
 - job-template:
     name: 'csit-docs-merge-{stream}'
 
     project-type: freestyle
-    node: 'verify-ubuntu1604'
+    node: 'ubuntu1604-basebuild-4c-4g'
     concurrent: true
 
     logrotate:
@@ -626,6 +640,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - maven-exec:
+            maven-version: 'mvn33-new'
 
     scm:
         - gerrit-trigger-scm:
@@ -655,7 +671,7 @@
 
     builders:
         - maven-target:
-            maven-version: 'mvn33'
+            maven-version: 'mvn33-new'
             goals: '--version'
             settings: 'csit-settings'
             settings-type: cfp
@@ -675,6 +691,8 @@
             only-if-success: true
             default-excludes: false
 
+        - fdio-infra-shiplogs:
+            maven-version: 'mvn33-new'
 
 - parameter:
     name: test-type-parameter