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 "Enable log shipping on all nsh_sfc jobs"
[ci-management.git]
/
jjb
/
vpp
/
vpp.yaml
diff --git
a/jjb/vpp/vpp.yaml
b/jjb/vpp/vpp.yaml
index
36b97a6
..
406ae3a
100644
(file)
--- a/
jjb/vpp/vpp.yaml
+++ b/
jjb/vpp/vpp.yaml
@@
-28,6
+28,9
@@
- '1609':
branch: 'stable/1609'
repo-stream-part: 'stable.1609'
- '1609':
branch: 'stable/1609'
repo-stream-part: 'stable.1609'
+ - '1701':
+ branch: 'stable/1701'
+ repo-stream-part: 'stable.1701'
type:
- short
- long
type:
- short
- long
@@
-51,8
+54,11
@@
- '1609':
branch: 'stable/1609'
repo-stream-part: 'stable.1609'
- '1609':
branch: 'stable/1609'
repo-stream-part: 'stable.1609'
+ - '1701':
+ branch: 'stable/1701'
+ repo-stream-part: 'stable.1609'
- os: ubuntu1
4
04
+ os: ubuntu1
6
04
type:
- all
- short
type:
- all
- short
@@
-62,7
+68,7
@@
name: 'vpp-verify-{stream}-{os}'
project-type: freestyle
name: 'vpp-verify-{stream}-{os}'
project-type: freestyle
- node: '
verify-{os}
'
+ node: '
{os}-basebuild-4c-4g
'
concurrent: true
logrotate:
concurrent: true
logrotate:
@@
-81,15
+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:
- - timestamps
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
@@
-110,12
+112,14
@@
fingerprint: false
only-if-success: true
default-excludes: false
fingerprint: false
only-if-success: true
default-excludes: false
+ - fdio-infra-shiplogs:
+ maven-version: 'mvn33-new'
- job-template:
name: 'vpp-verify-image-{stream}-{os}'
project-type: freestyle
- job-template:
name: 'vpp-verify-image-{stream}-{os}'
project-type: freestyle
- node: '
verify-image-{os}
'
+ node: '
{os}-basebuild-4c-4g
'
concurrent: true
logrotate:
concurrent: true
logrotate:
@@
-134,15
+138,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:
- - timestamps
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
@@
-170,11
+170,15
@@
- shell:
!include-raw-escape: include-raw-vpp-build.sh
- shell:
!include-raw-escape: include-raw-vpp-build.sh
+ publishers:
+ - fdio-infra-shiplogs:
+ maven-version: 'mvn33-new'
+
- job-template:
name: 'vpp-merge-{stream}-{os}'
project-type: freestyle
- job-template:
name: 'vpp-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}'
@@
-190,21
+194,19
@@
- os-parameter:
os: '{os}'
- maven-project-parameter:
- os-parameter:
os: '{os}'
- maven-project-parameter:
- maven: '{mvn33}'
+ maven: 'mvn33-new'
+ - 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:
- - timestamps
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
@@
-214,17
+216,17
@@
branch: '{branch}'
builders:
branch: '{branch}'
builders:
- - shell:
- !include-raw-escape: include-raw-vpp-checkstyle.sh
- - shell:
- !include-raw-escape: include-raw-vpp-build.sh
- maven-target:
- maven-target:
- maven-version: '
{mvn33}
'
+ maven-version: '
mvn33-new
'
goals: '--version'
settings: 'vpp-settings'
settings-type: cfp
global-settings: 'global-settings'
global-settings-type: cfp
goals: '--version'
settings: 'vpp-settings'
settings-type: cfp
global-settings: 'global-settings'
global-settings-type: cfp
+ - shell:
+ !include-raw-escape: include-raw-vpp-checkstyle.sh
+ - shell:
+ !include-raw-escape: include-raw-vpp-build.sh
- provide-maven-settings:
settings-file: 'vpp-settings'
global-settings-file: 'global-settings'
- provide-maven-settings:
settings-file: 'vpp-settings'
global-settings-file: 'global-settings'
@@
-239,12
+241,14
@@
fingerprint: false
only-if-success: true
default-excludes: false
fingerprint: false
only-if-success: true
default-excludes: false
+ - fdio-infra-shiplogs:
+ maven-version: 'mvn33-new'
- job-template:
name: 'vpp-csit-verify-virl-{stream}'
project-type: freestyle
- job-template:
name: 'vpp-csit-verify-virl-{stream}'
project-type: freestyle
- node: '
verify-{os}
'
+ node: '
{os}-basebuild-4c-4g
'
concurrent: true
logrotate:
concurrent: true
logrotate:
@@
-260,18
+264,16
@@
branch: '{branch}'
- os-parameter:
os: '{os}'
branch: '{branch}'
- os-parameter:
os: '{os}'
+ - is-csit-vpp-job-parameter:
+ is-csit-vpp-job: 'True'
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:
- - timestamps
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
@@
-296,11
+298,14
@@
- robot-report:
output-path: 'csit'
- robot-report:
output-path: 'csit'
+ - fdio-infra-shiplogs:
+ maven-version: 'mvn33-new'
+
- job-template:
name: 'vpp-csit-verify-hw-perf-{stream}-{type}'
project-type: freestyle
- job-template:
name: 'vpp-csit-verify-hw-perf-{stream}-{type}'
project-type: freestyle
- node: '
verify-{os}
'
+ node: '
{os}-basebuild-4c-4g
'
concurrent: false
logrotate:
concurrent: false
logrotate:
@@
-318,20
+323,18
@@
os: '{os}'
- type-parameter:
type: '{type}'
os: '{os}'
- type-parameter:
type: '{type}'
+ - is-csit-vpp-job-parameter:
+ is-csit-vpp-job: 'True'
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:
- - timestamps
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
- - fdio-infra-wrappers:
- build-timeout: '{build-timeout}'
+ - fdio-infra-wrappers-non-activity-timeout:
+ build-timeout: 30
triggers:
- gerrit-trigger-manually-triggered:
triggers:
- gerrit-trigger-manually-triggered:
@@
-353,6
+356,9
@@
- robot-report:
output-path: 'csit'
- robot-report:
output-path: 'csit'
+ - fdio-infra-shiplogs:
+ maven-version: 'mvn33-new'
+
- parameter:
name: type-parameter
- parameter:
name: type-parameter
@@
-366,7
+372,7
@@
name: 'vpp-docs-verify-{stream}'
project-type: freestyle
name: 'vpp-docs-verify-{stream}'
project-type: freestyle
- node:
'verify-ubuntu1604'
+ node:
ubuntu1604-basebuild-4c-4g
concurrent: true
logrotate:
concurrent: true
logrotate:
@@
-382,18
+388,16
@@
branch: '{branch}'
- os-parameter:
os: 'ubuntu1604'
branch: '{branch}'
- os-parameter:
os: 'ubuntu1604'
+ - maven-exec:
+ maven-version: 'mvn33-new'
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:
- - timestamps
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
@@
-404,7
+408,7
@@
builders:
- maven-target:
builders:
- maven-target:
- maven-version: '
{mvn33}
'
+ maven-version: '
mvn33-new
'
goals: '--version'
settings: 'vpp-settings'
settings-type: cfp
goals: '--version'
settings: 'vpp-settings'
settings-type: cfp
@@
-422,12
+426,14
@@
fingerprint: false
only-if-success: true
default-excludes: false
fingerprint: false
only-if-success: true
default-excludes: false
+ - fdio-infra-shiplogs:
+ maven-version: 'mvn33-new'
- job-template:
name: 'vpp-docs-merge-{stream}'
project-type: freestyle
- job-template:
name: 'vpp-docs-merge-{stream}'
project-type: freestyle
- node:
'verify-ubuntu1604'
+ node:
ubuntu1604-basebuild-4c-4g
concurrent: true
logrotate:
concurrent: true
logrotate:
@@
-443,18
+449,16
@@
branch: '{branch}'
- os-parameter:
os: 'ubuntu1604'
branch: '{branch}'
- os-parameter:
os: 'ubuntu1604'
+ - maven-exec:
+ maven-version: 'mvn33-new'
scm:
- gerrit-trigger-scm:
scm:
- gerrit-trigger-scm:
- credentials-id: '
{ssh-credentials}
'
+ credentials-id: '
jenkins-gerrit-credentials
'
refspec: ''
choosing-strategy: 'default'
wrappers:
refspec: ''
choosing-strategy: 'default'
wrappers:
- - timestamps
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
@@
-481,7
+485,7
@@
builders:
- maven-target:
builders:
- maven-target:
- maven-version: '
{mvn33}
'
+ maven-version: '
mvn33-new
'
goals: '--version'
settings: 'vpp-settings'
settings-type: cfp
goals: '--version'
settings: 'vpp-settings'
settings-type: cfp
@@
-499,4
+503,5
@@
fingerprint: false
only-if-success: true
default-excludes: false
fingerprint: false
only-if-success: true
default-excludes: false
-
+ - fdio-infra-shiplogs:
+ maven-version: 'mvn33-new'