Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
bottlenecks: enable daily deploy job.
[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
95d851c
..
23c6c7b
100644
(file)
--- a/
jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
+++ b/
jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
@@
-18,7
+18,7
@@
branch: '{stream}'
gs-pathname: ''
disabled: false
branch: '{stream}'
gs-pathname: ''
disabled: false
- -
danube
:
+ -
euphrates
:
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
disabled: true
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
disabled: true
@@
-29,7
+29,7
@@
- 'build':
slave-label: 'opnfv-build-centos'
- 'deploy-virtual':
- 'build':
slave-label: 'opnfv-build-centos'
- 'deploy-virtual':
- slave-label: '
opnfv-build-centos
'
+ slave-label: '
daisy-virtual
'
#####################################
# jobs
#####################################
#####################################
# jobs
#####################################
@@
-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|euphrates)'
+ block-level: 'NODE'
scm:
- git-scm
scm:
- git-scm
@@
-84,6
+89,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
+153,8
@@
- build-blocker:
use-build-blocker: true
blocking-jobs:
- build-blocker:
use-build-blocker: true
blocking-jobs:
- - '{alias}-merge-deploy-.*'
+ - '{alias}-merge-{phase}-.*'
+ - '{installer}-daily-.*'
block-level: 'NODE'
scm:
block-level: 'NODE'
scm:
@@
-163,6
+170,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}'
@@
-184,8
+192,7
@@
!include-raw: ./daisy4nfv-build.sh
- shell:
!include-raw: ./daisy4nfv-upload-artifact.sh
!include-raw: ./daisy4nfv-build.sh
- shell:
!include-raw: ./daisy4nfv-upload-artifact.sh
- - shell:
- !include-raw: ./daisy4nfv-workspace-cleanup.sh
+ - 'clean-workspace'
- builder:
name: 'daisy-merge-deploy-virtual-macro'
- builder:
name: 'daisy-merge-deploy-virtual-macro'
@@
-194,8
+201,7
@@
!include-raw: ./daisy4nfv-download-artifact.sh
- shell:
!include-raw: ./daisy-deploy.sh
!include-raw: ./daisy4nfv-download-artifact.sh
- shell:
!include-raw: ./daisy-deploy.sh
- - shell:
- !include-raw: ./daisy4nfv-workspace-cleanup.sh
+ - 'clean-workspace'
#####################################
# parameter macros
#####################################
# parameter macros