Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "doctor: make test script run in doctor-verify job"
[releng.git]
/
jjb
/
opnfv
/
opnfv-docs.yml
diff --git
a/jjb/opnfv/opnfv-docs.yml
b/jjb/opnfv/opnfv-docs.yml
index
6c6b915
..
31f5d00
100644
(file)
--- a/
jjb/opnfv/opnfv-docs.yml
+++ b/
jjb/opnfv/opnfv-docs.yml
@@
-11,11
+11,13
@@
- 'opnfv-docs-verify-{stream}'
- 'opnfv-docs-merge-{stream}'
- 'opnfv-docs-verify-{stream}'
- 'opnfv-docs-merge-{stream}'
- # stream: branch with - in place of / (eg. stable-arno)
- # branch: branch (eg. stable/arno)
stream:
- master:
stream:
- master:
- branch: 'master'
+ branch: '{stream}'
+ gs-pathname: ''
+ - brahmaputra:
+ branch: 'stable/{stream}'
+ gs-pathname: '/{stream}'
########################
# job templates
########################
# job templates
@@
-28,7
+30,7
@@
- project-parameter:
project: $GERRIT_PROJECT
- gerrit-parameter:
- project-parameter:
project: $GERRIT_PROJECT
- gerrit-parameter:
- branch: '
master
'
+ branch: '
{branch}
'
scm:
- gerrit-trigger-scm:
scm:
- gerrit-trigger-scm:
@@
-51,10
+53,10
@@
projects:
- project-compare-type: 'REG_EXP'
#Left out arno projects oscar|octopus|functest|genesis
projects:
- project-compare-type: 'REG_EXP'
#Left out arno projects oscar|octopus|functest|genesis
- project-pattern: 'vswitchperf|yardstick|apex|availability|bottlenecks|compass4nfv|conductor|copper|doctor|dovetail|dpacc|escalator|fastpathmetrics|fuel|inspector|ipv6|joid|kvmfornfv|lsoapi|moon|movie|multisite|onosfw|ovsnfv|parser|prediction|promise|qtip|releng|rs|sdnvpn|sfc|vnf_forwarding_graph|enfv|pinpoint|pharos|opnfvdocs|cperf'
+ project-pattern: 'vswitchperf|yardstick|apex|availability|bottlenecks|compass4nfv|conductor|copper|doctor|dovetail|dpacc|escalator|fastpathmetrics|fuel|inspector|ipv6|joid|kvmfornfv|lsoapi|moon|movie|multisite|onosfw|ovsnfv|parser|prediction|promise|qtip|releng|rs|sdnvpn|sfc|vnf_forwarding_graph|enfv|pinpoint|pharos|opnfvdocs|cperf
|functest
'
branches:
- branch-compare-type: 'ANT'
branches:
- branch-compare-type: 'ANT'
- branch-pattern: '**/
master
'
+ branch-pattern: '**/
{branch}
'
file-paths:
- compare-type: ANT
pattern: 'docs/**'
file-paths:
- compare-type: ANT
pattern: 'docs/**'
@@
-69,7
+71,11
@@
- project-parameter:
project: $GERRIT_PROJECT
- gerrit-parameter:
- project-parameter:
project: $GERRIT_PROJECT
- gerrit-parameter:
- branch: 'master'
+ branch: '{branch}'
+ - string:
+ name: GS_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:
@@
-85,10
+91,10
@@
comment-contains-value: 'remerge'
projects:
- project-compare-type: 'REG_EXP'
comment-contains-value: 'remerge'
projects:
- project-compare-type: 'REG_EXP'
- project-pattern: 'vswitchperf|yardstick|apex|availability|bottlenecks|compass4nfv|conductor|copper|doctor|dovetail|dpacc|escalator|fastpathmetrics|fuel|inspector|ipv6|joid|kvmfornfv|lsoapi|moon|movie|multisite|onosfw|ovsnfv|parser|prediction|promise|qtip|releng|rs|sdnvpn|sfc|vnf_forwarding_graph|enfv|pinpoint|pharos|opnfvdocs|cperf'
+ project-pattern: 'vswitchperf|yardstick|apex|availability|bottlenecks|compass4nfv|conductor|copper|doctor|dovetail|dpacc|escalator|fastpathmetrics|fuel|inspector|ipv6|joid|kvmfornfv|lsoapi|moon|movie|multisite|onosfw|ovsnfv|parser|prediction|promise|qtip|releng|rs|sdnvpn|sfc|vnf_forwarding_graph|enfv|pinpoint|pharos|opnfvdocs|cperf
|functest
'
branches:
- branch-compare-type: 'ANT'
branches:
- branch-compare-type: 'ANT'
- branch-pattern: '**/
master
'
+ branch-pattern: '**/
{branch}
'
file-paths:
- compare-type: ANT
pattern: 'docs/**'
file-paths:
- compare-type: ANT
pattern: 'docs/**'