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 "utils: fix yamllint issues"
[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
a6659b2
..
11531f4
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:
tru
e
+ disabled:
fals
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/**'
@@
-193,7
+194,7
@@
- shell:
!include-raw: ./daisy4nfv-download-artifact.sh
- shell:
- shell:
!include-raw: ./daisy4nfv-download-artifact.sh
- shell:
- !include-raw: ./daisy
4nfv-virtual
-deploy.sh
+ !include-raw: ./daisy-deploy.sh
- shell:
!include-raw: ./daisy4nfv-workspace-cleanup.sh
- shell:
!include-raw: ./daisy4nfv-workspace-cleanup.sh