X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fdeb_dpdk%2Fdeb_dpdk.yaml;h=abc238cfe582e6ef279012094cce001c9eafcb95;hb=a247aa6703f3a09c0bcd74fd403c38876d5f3db3;hp=8bf8204820b7e43359f60ca28fc41a5c0eced9b9;hpb=2d286c0bfff820a47ba091d3952c6f3c6c7daa9d;p=ci-management.git

diff --git a/jjb/deb_dpdk/deb_dpdk.yaml b/jjb/deb_dpdk/deb_dpdk.yaml
index 8bf820482..abc238cfe 100644
--- a/jjb/deb_dpdk/deb_dpdk.yaml
+++ b/jjb/deb_dpdk/deb_dpdk.yaml
@@ -12,18 +12,21 @@
         - ubuntu1604:
             repo-os-part: 'ubuntu.xenial.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'
 
 - job-template:
     name: 'deb_dpdk-verify-{stream}-{os}'
 
     project-type: freestyle
-    node: 'verify-{os}'
+    node: '{os}-basebuild-4c-4g'
     concurrent: true
 
     logrotate:
@@ -49,9 +52,6 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - 'jenkins-gerrit-credentials'
         - fdio-infra-wrappers:
             build-timeout: '{build-timeout}'
 
@@ -65,11 +65,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:
@@ -95,9 +99,6 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - 'jenkins-gerrit-credentials'
         - fdio-infra-wrappers:
             build-timeout: '{build-timeout}'
 
@@ -124,11 +125,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}'
@@ -143,6 +148,8 @@
             branch: '{branch}'
         - os-parameter:
             os: '{os}'
+        - maven-exec:
+            maven-version: 'mvn33-new'
         - repo-name-parameter:
             repo-name: '{repo-stream-part}.{repo-os-part}'
 
@@ -153,9 +160,6 @@
             choosing-strategy: 'default'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - 'jenkins-gerrit-credentials'
         - fdio-infra-wrappers:
             build-timeout: '{build-timeout}'
 
@@ -165,6 +169,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'
@@ -180,3 +191,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'