Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
xci: Configure daily job to use xci scripts
[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
a448933
..
95e72e5
100644
(file)
--- a/
jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
+++ b/
jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
@@
-21,7
+21,7
@@
- danube:
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
- danube:
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
- disabled:
fals
e
+ disabled:
tru
e
#####################################
# patch merge phases
#####################################
#####################################
# patch merge phases
#####################################
@@
-84,6
+84,7
@@
pattern: 'code/**'
- compare-type: ANT
pattern: 'deploy/**'
pattern: 'code/**'
- compare-type: ANT
pattern: 'deploy/**'
+ disable-strict-forbidden-file-verification: 'true'
forbidden-file-paths:
- compare-type: ANT
pattern: 'docs/**'
forbidden-file-paths:
- compare-type: ANT
pattern: 'docs/**'
@@
-147,7
+148,8
@@
- build-blocker:
use-build-blocker: true
blocking-jobs:
- build-blocker:
use-build-blocker: true
blocking-jobs:
- - '{alias}-merge-deploy-.*'
+ - '{alias}-(merge|verify)-.*'
+ - '{project}-daily-.*'
block-level: 'NODE'
scm:
block-level: 'NODE'
scm: