Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
improve: discard venv support for official product
[releng.git]
/
jjb
/
daisy4nfv
/
daisy4nfv-merge-jobs.yml
diff --git
a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
index
9e7b867
..
561ffbe
100644
(file)
--- a/
jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
+++ b/
jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
@@
-54,6
+54,11
@@
enabled: true
max-total: 4
option: 'project'
enabled: true
max-total: 4
option: 'project'
+ - build-blocker:
+ use-build-blocker: true
+ blocking-jobs:
+ - '{alias}-merge-(master|danube)'
+ block-level: 'NODE'
scm:
- git-scm
scm:
- git-scm
@@
-148,7
+153,7
@@
- build-blocker:
use-build-blocker: true
blocking-jobs:
- build-blocker:
use-build-blocker: true
blocking-jobs:
- - '{alias}-merge-
(master|danube)
'
+ - '{alias}-merge-
{phase}-.*
'
block-level: 'NODE'
scm:
block-level: 'NODE'
scm:
@@
-164,6
+169,7
@@
- project-parameter:
project: '{project}'
branch: '{branch}'
- project-parameter:
project: '{project}'
branch: '{branch}'
+ - '{installer}-defaults'
- '{slave-label}-defaults'
- '{alias}-merge-defaults':
gs-pathname: '{gs-pathname}'
- '{slave-label}-defaults'
- '{alias}-merge-defaults':
gs-pathname: '{gs-pathname}'