X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fdeb_dpdk%2Fdeb_dpdk.yaml;h=9f05f3c5aae864a20c04bce843dc8bd1536a5e14;hb=9232f92ae6c6d70d403c84a71ea1ab730358161e;hp=81c1d9917130ebeed24dd026ebf1d6e14210956e;hpb=c30e95d9b01d1596fd9e80b65b459e2b26c3b79b;p=ci-management.git

diff --git a/jjb/deb_dpdk/deb_dpdk.yaml b/jjb/deb_dpdk/deb_dpdk.yaml
index 81c1d9917..9f05f3c5a 100644
--- a/jjb/deb_dpdk/deb_dpdk.yaml
+++ b/jjb/deb_dpdk/deb_dpdk.yaml
@@ -7,8 +7,6 @@
 
     project: 'deb_dpdk'
     os:
-        - ubuntu1404:
-            repo-os-part: 'ubuntu.trusty.main'
         - ubuntu1604:
             repo-os-part: 'ubuntu.xenial.main'
     stream:
@@ -18,12 +16,18 @@
         - 1611:
             branch: '16.11.x'
             repo-stream-part: 'deb_dpdk_1611'
+        - 1705:
+            branch: '17.05.x'
+            repo-stream-part: 'deb_dpdk_1705'
+        - 1708:
+            branch: '17.08.x'
+            repo-stream-part: 'deb_dpdk_1708'
 
 - job-template:
     name: 'deb_dpdk-verify-{stream}-{os}'
 
     project-type: freestyle
-    node: 'verify-{os}'
+    node: '{os}-basebuild-4c-4g'
     concurrent: true
 
     logrotate:
@@ -62,11 +66,15 @@
             !include-raw-escape:
                 - include-raw-deb_dpdk-build.sh
 
+    publishers:
+        - fdio-infra-shiplogs:
+            maven-version: 'mvn33-new'
+
 - job-template:
     name: 'deb_dpdk-verify-image-{stream}-{os}'
 
     project-type: freestyle
-    node: 'verify-image-{os}'
+    node: '{os}-basebuild-4c-4g'
     concurrent: true
 
     logrotate:
@@ -118,11 +126,15 @@
             !include-raw-escape:
                 - include-raw-deb_dpdk-build.sh
 
+    publishers:
+        - fdio-infra-shiplogs:
+            maven-version: 'mvn33-new'
+
 - job-template:
     name: 'deb_dpdk-merge-{stream}-{os}'
 
     project-type: freestyle
-    node: 'merge-{os}'
+    node: '{os}-basebuild-4c-4g'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -137,6 +149,8 @@
             branch: '{branch}'
         - os-parameter:
             os: '{os}'
+        - maven-exec:
+            maven-version: 'mvn33-new'
         - repo-name-parameter:
             repo-name: '{repo-stream-part}.{repo-os-part}'
 
@@ -156,6 +170,13 @@
             branch: '{branch}'
 
     builders:
+        - maven-target:
+            maven-version: 'mvn33-new'
+            goals: '--version'
+            settings: 'deb_dpdk-settings'
+            settings-type: cfp
+            global-settings: 'global-settings'
+            global-settings-type: cfp
         - config-file-provider:
             files:
               - file-id: 'deb_dpdk-settings'
@@ -171,3 +192,7 @@
                 - include-raw-deb_dpdk-build.sh
                 - ../scripts/maven_push_functions.sh
                 - include-raw-deb_dpdk-pkg-push.sh
+
+    publishers:
+        - fdio-infra-shiplogs:
+            maven-version: 'mvn33-new'