Create new builds for OC40 with newer dpdk
* Build of vrouter-dpdk dependencies
* Build of Opencontrail with dpdk 1702
Change-Id: I9003dfa0e335fef7fe9a6245fbfd2063b7c64a68
diff --git a/jenkins/client/job/opencontrail/build/dpdk-extra.yml b/jenkins/client/job/opencontrail/build/dpdk-extra.yml
index e69b4a4..156cedb 100644
--- a/jenkins/client/job/opencontrail/build/dpdk-extra.yml
+++ b/jenkins/client/job/opencontrail/build/dpdk-extra.yml
@@ -9,22 +9,38 @@
dist: trusty
branch_name: kilo
branch_real_name: kilo
+ aptly_repo: ubuntu-trusty-kilo
+ binary: "all"
- os: ubuntu
dist: trusty
branch_name: liberty
branch_real_name: liberty-multiqueue
+ aptly_repo: ubuntu-trusty-liberty
+ binary: "all"
- os: ubuntu
dist: trusty
branch_name: mitaka
branch_real_name: mitaka
+ aptly_repo: ubuntu-trusty-mitaka
+ binary: "all"
- os: ubuntu
dist: xenial
branch_name: mitaka
branch_real_name: mitaka
+ aptly_repo: ubuntu-xenial-mitaka
+ binary: "all"
- os: ubuntu
dist: xenial
branch_name: newton
branch_real_name: newton
+ aptly_repo: ubuntu-xenial-newton
+ binary: "all"
+ - os: ubuntu
+ dist: xenial
+ branch_name: dpdk1702
+ branch_real_name: mitaka_dpdk_17_02
+ aptly_repo: ubuntu-xenial-oc40-dpdk1702
+ binary: "contrail-dpdk-kernel-modules-dkms"
template:
discard:
build:
@@ -67,4 +83,4 @@
BINARY_PACKAGES:
description: "binary packages to create"
type: string
- default: "all"
+ default: "{{binary}}"
diff --git a/jenkins/client/job/opencontrail/build/generic.yml b/jenkins/client/job/opencontrail/build/generic.yml
index 27e3117..d781ac0 100644
--- a/jenkins/client/job/opencontrail/build/generic.yml
+++ b/jenkins/client/job/opencontrail/build/generic.yml
@@ -13,66 +13,91 @@
branch: R3.0.3.x
ppa: mirantis-opencontrail/opencontrail-3.0.3
upload_source_package: false
+ dpdk: contrail_dpdk_2_1
- buildname: oc31
os: ubuntu
dist: trusty
branch: R3.1
ppa: mirantis-opencontrail/opencontrail-3.1
upload_source_package: true
+ dpdk: contrail_dpdk_2_1
- buildname: oc31
os: ubuntu
dist: xenial
branch: R3.1
ppa: mirantis-opencontrail/opencontrail-3.1
upload_source_package: true
+ dpdk: contrail_dpdk_2_1
- buildname: oc311
os: ubuntu
dist: trusty
branch: R3.1.1.x
ppa: mirantis-opencontrail/opencontrail-3.1.1
upload_source_package: true
+ dpdk: contrail_dpdk_2_1
- buildname: oc311
os: ubuntu
dist: xenial
branch: R3.1.1.x
ppa: mirantis-opencontrail/opencontrail-3.1.1
upload_source_package: true
+ dpdk: contrail_dpdk_2_1
- buildname: oc32
os: ubuntu
dist: trusty
branch: R3.2
ppa: mirantis-opencontrail/opencontrail-3.2
upload_source_package: true
+ dpdk: contrail_dpdk_2_1
- buildname: oc32
os: ubuntu
dist: xenial
branch: R3.2
ppa: mirantis-opencontrail/opencontrail-3.2
upload_source_package: true
+ dpdk: contrail_dpdk_2_1
- buildname: oc323
os: ubuntu
dist: trusty
branch: R3.2.3.x
ppa: mirantis-opencontrail/opencontrail-3.2.3
upload_source_package: true
+ dpdk: contrail_dpdk_2_1
- buildname: oc323
os: ubuntu
dist: xenial
branch: R3.2.3.x
ppa: mirantis-opencontrail/opencontrail-3.2.3
upload_source_package: true
+ dpdk: contrail_dpdk_2_1
- buildname: oc40
os: ubuntu
dist: trusty
branch: R4.0
ppa: mirantis-opencontrail/opencontrail-4.0
- upload_source_package: false
+ upload_source_package: true
+ dpdk: contrail_dpdk_2_1
- buildname: oc40
os: ubuntu
dist: xenial
branch: R4.0
ppa: mirantis-opencontrail/opencontrail-4.0
+ upload_source_package: true
+ dpdk: contrail_dpdk_2_1
+ - buildname: oc40-dpdk-17-02
+ os: ubuntu
+ dist: trusty
+ branch: R4.0
+ ppa: mirantis-opencontrail/opencontrail-4.0-dpdk-17-02
upload_source_package: false
+ dpdk: contrail_dpdk_17_02
+ - buildname: oc40-dpdk-17-02
+ os: ubuntu
+ dist: xenial
+ branch: R4.0
+ ppa: mirantis-opencontrail/opencontrail-4.0-dpdk-17-02
+ upload_source_package: false
+ dpdk: contrail_dpdk_17_02
- buildname: oc666
os: ubuntu
dist: trusty
@@ -120,10 +145,9 @@
type: boolean
default: 'false'
description: "Don't cleanup on failure"
- DEBUG_DPDK:
- type: boolean
- default: 'false'
- description: "CONFIG_RTE_LIBRTE_ETHDEV_DEBUG enabled or disabled"
+ DPDK_BRANCH:
+ type: string
+ default: "{{dpdk}}"
OS:
type: string
default: "{{os}}"