X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fdeb_dpdk%2Fdeb_dpdk.yaml;h=fac89b7ba988d8954a7171ed0246e855b03d0521;hb=2db4609c5ed4c2b4853c6afb912d04a883c0fb99;hp=d7f9384eedc793e83f33d94d0eb77c420b5cefc9;hpb=cfb0dbb8acb0d62ae924e094cf9ff717fdbd293e;p=ci-management.git

diff --git a/jjb/deb_dpdk/deb_dpdk.yaml b/jjb/deb_dpdk/deb_dpdk.yaml
index d7f9384ee..fac89b7ba 100644
--- a/jjb/deb_dpdk/deb_dpdk.yaml
+++ b/jjb/deb_dpdk/deb_dpdk.yaml
@@ -7,23 +7,36 @@
 
     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'
 
 - job-template:
     name: 'deb_dpdk-verify-{stream}-{os}'
 
     project-type: freestyle
-    node: 'verify-{os}'
+    node: '{os}-basebuild-4c-4g'
     concurrent: true
 
     logrotate:
@@ -44,14 +57,11 @@
 
     scm:
         - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'jenkins-gerrit-credentials'
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
         - fdio-infra-wrappers:
             build-timeout: '{build-timeout}'
 
@@ -65,11 +75,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:
@@ -90,14 +104,11 @@
 
     scm:
         - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'jenkins-gerrit-credentials'
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
         - fdio-infra-wrappers:
             build-timeout: '{build-timeout}'
 
@@ -124,11 +135,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,19 +158,18 @@
             branch: '{branch}'
         - os-parameter:
             os: '{os}'
+        - maven-exec:
+            maven-version: 'mvn33-new'
         - repo-name-parameter:
             repo-name: '{repo-stream-part}.{repo-os-part}'
 
     scm:
         - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'jenkins-gerrit-credentials'
             refspec: ''
             choosing-strategy: 'default'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
         - fdio-infra-wrappers:
             build-timeout: '{build-timeout}'
 
@@ -165,6 +179,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 +201,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'