X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fdeb_dpdk%2Fdeb_dpdk.yaml;h=e0d3b452ed8f5561d3ab49d570b5d86a555bde9e;hb=95a8c42349da54996cdc2c747d5d52b0ffed2e0d;hp=3283aeb34969f75e3c8da4481c82acdddec13d35;hpb=7033cb8235cc8ab08239c6a5fda216dee659655c;p=ci-management.git

diff --git a/jjb/deb_dpdk/deb_dpdk.yaml b/jjb/deb_dpdk/deb_dpdk.yaml
index 3283aeb34..e0d3b452e 100644
--- a/jjb/deb_dpdk/deb_dpdk.yaml
+++ b/jjb/deb_dpdk/deb_dpdk.yaml
@@ -7,23 +7,39 @@
 
     project: 'deb_dpdk'
     os:
-        - ubuntu1404:
-            repo-os-part: 'ubuntu.trusty.main'
-        - ubuntu1604:
-            repo-os-part: 'ubuntu.xenial.main'
+        - ubuntu1804:
+            repo-os-part: 'ubuntu.bionic.main'
     stream:
-        - master:
-            branch: 'master'
-            repo-stream-part: 'master'
         - 1607:
             branch: 'deb_dpdk_16.07'
             repo-stream-part: 'deb_dpdk_1607'
+        - 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'
+        - 1711:
+            branch: '17.11.x'
+            repo-stream-part: 'deb_dpdk_1711'
+        - 1802:
+            branch: '18.02.x'
+            repo-stream-part: 'deb_dpdk_1802'
+        - 1805:
+            branch: '18.05.x'
+            repo-stream-part: 'deb_dpdk_1805'
+        - 1808:
+            branch: '18.08.x'
+            repo-stream-part: 'deb_dpdk_1808'
 
 - job-template:
     name: 'deb_dpdk-verify-{stream}-{os}'
 
     project-type: freestyle
-    node: 'verify-{os}'
+    node: '{os}-basebuild-4c-4g'
     concurrent: true
 
     logrotate:
@@ -62,11 +78,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 +138,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 +161,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 +182,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 +204,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'