Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update Global-jjb to master
[releng.git]
/
jjb
/
daisy4nfv
/
daisy4nfv-merge-jobs.yaml
diff --git
a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yaml
b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yaml
index
3a0a59f
..
c261c23
100644
(file)
--- a/
jjb/daisy4nfv/daisy4nfv-merge-jobs.yaml
+++ b/
jjb/daisy4nfv/daisy4nfv-merge-jobs.yaml
@@
-18,11
+18,11
@@
- master:
branch: '{stream}'
gs-pathname: ''
- master:
branch: '{stream}'
gs-pathname: ''
- disabled:
fals
e
+ disabled:
tru
e
- fraser:
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
- fraser:
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
- disabled:
fals
e
+ disabled:
tru
e
#####################################
# patch merge phases
#####################################
#####################################
# patch merge phases
#####################################
@@
-61,7
+61,7
@@
use-build-blocker: true
blocking-jobs:
- '{alias}-merge-(master|fraser)'
use-build-blocker: true
blocking-jobs:
- '{alias}-merge-(master|fraser)'
- block-level: 'NODE'
+ block
ing
-level: 'NODE'
scm:
- git-scm
scm:
- git-scm
@@
-158,7
+158,7
@@
blocking-jobs:
- '{alias}-merge-{phase}-.*'
- '{installer}-daily-.*'
blocking-jobs:
- '{alias}-merge-{phase}-.*'
- '{installer}-daily-.*'
- block-level: 'NODE'
+ block
ing
-level: 'NODE'
scm:
- git-scm
scm:
- git-scm