X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fdeb_dpdk%2Fdeb_dpdk.yaml;h=62d55a53169b3dc7ede09585e263b4de41b26630;hb=0667c29be0642396fefd418edea9b2c0bd14bb54;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..62d55a531 100644 --- a/jjb/deb_dpdk/deb_dpdk.yaml +++ b/jjb/deb_dpdk/deb_dpdk.yaml @@ -12,18 +12,18 @@ - 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' - job-template: name: 'deb_dpdk-verify-{stream}-{os}' project-type: freestyle - node: 'verify-{os}' + node: '{os}-basebuild-4c-4g' concurrent: true logrotate: @@ -62,11 +62,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 +122,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 +145,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 +166,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 +188,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'