Merge "Convert nsh_sfc to be Packer compliant"

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

diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index 4354bb0..18f806c 100644 (file)
--- 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:
@@ -85,7 +85,7 @@
     name: 'csit-vpp-perf-{stream}-{type}'
 
     project-type: freestyle
-    node: verify-ubuntu1604
+    node: ubuntu1604-basebuild-4c-4g
     concurrent: false
 
     logrotate:
@@ -270,7 +270,7 @@
     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:
@@ -329,7 +329,7 @@
     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:
@@ -377,7 +377,7 @@
     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:
@@ -553,7 +553,7 @@
     name: 'csit-docs-verify-{stream}'
 
     project-type: freestyle
-    node: 'verify-ubuntu1604'
+    node: 'ubuntu1604-basebuild-4c-4g'
     concurrent: true
 
     logrotate:
@@ -567,6 +567,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - maven-exec:
+            maven-version: 'mvn33-new'
 
     scm:
         - gerrit-trigger-scm:
@@ -587,7 +589,7 @@
 
     builders:
         - maven-target:
-            maven-version: 'mvn33'
+            maven-version: 'mvn33-new'
             goals: '--version'
             settings: 'csit-settings'
             settings-type: cfp
@@ -612,7 +614,7 @@
     name: 'csit-docs-merge-{stream}'
 
     project-type: freestyle
-    node: 'verify-ubuntu1604'
+    node: 'ubuntu1604-basebuild-4c-4g'
     concurrent: true
 
     logrotate:
@@ -626,6 +628,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - maven-exec:
+            maven-version: 'mvn33-new'
 
     scm:
         - gerrit-trigger-scm:
@@ -655,7 +659,7 @@
 
     builders:
         - maven-target:
-            maven-version: 'mvn33'
+            maven-version: 'mvn33-new'
             goals: '--version'
             settings: 'csit-settings'
             settings-type: cfp