Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove blocking deploy when verify is running
[releng.git]
/
jjb
/
ovsnfv
/
ovsnfv.yml
diff --git
a/jjb/ovsnfv/ovsnfv.yml
b/jjb/ovsnfv/ovsnfv.yml
index
4bfabff
..
d0c180c
100644
(file)
--- a/
jjb/ovsnfv/ovsnfv.yml
+++ b/
jjb/ovsnfv/ovsnfv.yml
@@
-1,5
+1,8
@@
- project:
name: ovsnfv
- project:
name: ovsnfv
+
+ project: '{name}'
+
jobs:
- 'ovsnfv-verify-{stream}'
- 'ovsnfv-merge-{stream}'
jobs:
- 'ovsnfv-verify-{stream}'
- 'ovsnfv-merge-{stream}'
@@
-7,30
+10,25
@@
stream:
- master:
stream:
- master:
- branch: 'master'
-
- project: 'ovsnfv'
+ branch: '{stream}'
+ gs-pathname: ''
+ - brahmaputra:
+ branch: 'stable/{stream}'
+ gs-pathname: '/{stream}'
- job-template:
name: 'ovsnfv-verify-{stream}'
- job-template:
name: 'ovsnfv-verify-{stream}'
- node: opnfv-build
-
- logrotate:
- daysToKeep: 30
- numToKeep: 10
- artifactDaysToKeep: -1
- artifactNumToKeep: -1
-
parameters:
- project-parameter:
project: '{project}'
- gerrit-parameter:
parameters:
- project-parameter:
project: '{project}'
- gerrit-parameter:
- branch: 'master'
+ branch: '{branch}'
+ - 'intel-us-build-2-defaults'
- string:
- string:
- name: G
IT_BASE
- default:
https://gerrit.opnfv.org/gerrit/$PROJECT
- description: "
Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW
."
+ name: G
S_URL
+ default:
'$GS_BASE{gs-pathname}'
+ description: "
Directory where the build artifact will be located upon the completion of the build
."
scm:
- gerrit-trigger-scm:
scm:
- gerrit-trigger-scm:
@@
-52,10
+50,10
@@
comment-contains-value: 'reverify'
projects:
- project-compare-type: 'ANT'
comment-contains-value: 'reverify'
projects:
- project-compare-type: 'ANT'
- project-pattern: '
ovsnfv
'
+ project-pattern: '
{project}
'
branches:
- branch-compare-type: 'ANT'
branches:
- branch-compare-type: 'ANT'
- branch-pattern: '**/
master
'
+ branch-pattern: '**/
{branch}
'
builders:
- shell: |
builders:
- shell: |
@@
-70,23
+68,16
@@
- job-template:
name: 'ovsnfv-merge-{stream}'
- job-template:
name: 'ovsnfv-merge-{stream}'
- node: opnfv-build
-
- logrotate:
- daysToKeep: 30
- numToKeep: 40
- artifactDaysToKeep: -1
- artifactNumToKeep: 5
-
parameters:
- project-parameter:
project: '{project}'
- gerrit-parameter:
parameters:
- project-parameter:
project: '{project}'
- gerrit-parameter:
- branch: 'master'
+ branch: '{branch}'
+ - 'intel-us-build-2-defaults'
- string:
- string:
- name: G
IT_BASE
- default:
https://gerrit.opnfv.org/gerrit/$PROJECT
- description: "
Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW
."
+ name: G
S_URL
+ default:
'$GS_BASE{gs-pathname}'
+ description: "
Directory where the build artifact will be located upon the completion of the build
."
scm:
- gerrit-trigger-scm:
scm:
- gerrit-trigger-scm:
@@
-102,10
+93,10
@@
comment-contains-value: 'remerge'
projects:
- project-compare-type: 'ANT'
comment-contains-value: 'remerge'
projects:
- project-compare-type: 'ANT'
- project-pattern: '
ovsnfv
'
+ project-pattern: '
{project}
'
branches:
- branch-compare-type: 'ANT'
branches:
- branch-compare-type: 'ANT'
- branch-pattern: '**/
master
'
+ branch-pattern: '**/
{branch}
'
builders:
- shell: |
builders:
- shell: |
@@
-120,23
+111,14
@@
- job-template:
name: 'ovsnfv-daily-{stream}'
- job-template:
name: 'ovsnfv-daily-{stream}'
- node: opnfv-build
-
- disabled: true
-
- logrotate:
- daysToKeep: '{build-days-to-keep}'
- numToKeep: '{build-num-to-keep}'
- artifactDaysToKeep: '{build-artifact-days-to-keep}'
- artifactNumToKeep: '{build-artifact-num-to-keep}'
-
parameters:
- project-parameter:
project: '{project}'
parameters:
- project-parameter:
project: '{project}'
+ - 'intel-us-build-2-defaults'
- string:
- string:
- name: G
IT_BASE
- default:
https://gerrit.opnfv.org/gerrit/$PROJECT
- description: "
Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW
."
+ name: G
S_URL
+ default:
'$GS_BASE{gs-pathname}'
+ description: "
Directory where the build artifact will be located upon the completion of the build
."
scm:
- git-scm:
scm:
- git-scm: