Code Review
/
ci-management.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Convert rpm_dpdk to be Packer compliant"
[ci-management.git]
/
jjb
/
deb_dpdk
/
deb_dpdk.yaml
diff --git
a/jjb/deb_dpdk/deb_dpdk.yaml
b/jjb/deb_dpdk/deb_dpdk.yaml
index
d7f9384
..
08040e2
100644
(file)
--- 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:
- 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'
- 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
- job-template:
name: 'deb_dpdk-verify-{stream}-{os}'
project-type: freestyle
- node: '
verify-{os}
'
+ node: '
{os}-basebuild-4c-4g
'
concurrent: true
logrotate:
concurrent: true
logrotate:
@@
-44,14
+44,11
@@
scm:
- gerrit-trigger-scm:
scm:
- gerrit-trigger-scm:
- credentials-id: '
{ssh-credentials}
'
+ credentials-id: '
jenkins-gerrit-credentials
'
refspec: '$GERRIT_REFSPEC'
choosing-strategy: 'gerrit'
wrappers:
refspec: '$GERRIT_REFSPEC'
choosing-strategy: 'gerrit'
wrappers:
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
@@
-69,7
+66,7
@@
name: 'deb_dpdk-verify-image-{stream}-{os}'
project-type: freestyle
name: 'deb_dpdk-verify-image-{stream}-{os}'
project-type: freestyle
- node: '
verify-image-{os}
'
+ node: '
{os}-basebuild-4c-4g
'
concurrent: true
logrotate:
concurrent: true
logrotate:
@@
-90,14
+87,11
@@
scm:
- gerrit-trigger-scm:
scm:
- gerrit-trigger-scm:
- credentials-id: '
{ssh-credentials}
'
+ credentials-id: '
jenkins-gerrit-credentials
'
refspec: '$GERRIT_REFSPEC'
choosing-strategy: 'gerrit'
wrappers:
refspec: '$GERRIT_REFSPEC'
choosing-strategy: 'gerrit'
wrappers:
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
@@
-128,7
+122,7
@@
name: 'deb_dpdk-merge-{stream}-{os}'
project-type: freestyle
name: 'deb_dpdk-merge-{stream}-{os}'
project-type: freestyle
- node: '
merge-{os}
'
+ node: '
{os}-basebuild-4c-4g
'
logrotate:
daysToKeep: '{build-days-to-keep}'
logrotate:
daysToKeep: '{build-days-to-keep}'
@@
-143,19
+137,18
@@
branch: '{branch}'
- os-parameter:
os: '{os}'
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:
- 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:
refspec: ''
choosing-strategy: 'default'
wrappers:
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
@@
-165,6
+158,13
@@
branch: '{branch}'
builders:
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'
- config-file-provider:
files:
- file-id: 'deb_dpdk-settings'