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 "Updating reporting url and fixed a bug"
[releng.git]
/
jjb
/
daisy4nfv
/
daisy-project-jobs.yml
diff --git
a/jjb/daisy4nfv/daisy-project-jobs.yml
b/jjb/daisy4nfv/daisy-project-jobs.yml
index
0127ed0
..
bcb8910
100644
(file)
--- a/
jjb/daisy4nfv/daisy-project-jobs.yml
+++ b/
jjb/daisy4nfv/daisy-project-jobs.yml
@@
-20,10
+20,6
@@
branch: '{stream}'
gs-pathname: ''
disabled: false
branch: '{stream}'
gs-pathname: ''
disabled: false
- - danube:
- branch: 'stable/{stream}'
- gs-pathname: '/{stream}'
- disabled: true
phase:
- 'build':
phase:
- 'build':
@@
-54,19
+50,26
@@
enabled: true
max-total: 4
option: 'project'
enabled: true
max-total: 4
option: 'project'
+ - build-blocker:
+ use-build-blocker: true
+ blocking-jobs:
+ - '{installer}-daily-.*'
+ - 'daisy4nfv-merge-build-.*'
+ - 'daisy4nfv-verify-build-.*'
+ block-level: 'NODE'
scm:
- git-scm
triggers:
scm:
- git-scm
triggers:
- - timed: '0
H/
8 * * *'
+ - timed: '0 8 * * *'
parameters:
- project-parameter:
project: '{project}'
branch: '{branch}'
- 'opnfv-build-centos-defaults'
parameters:
- project-parameter:
project: '{project}'
branch: '{branch}'
- 'opnfv-build-centos-defaults'
- - '
daisy
-defaults'
+ - '
{installer}
-defaults'
- '{installer}-project-parameter':
gs-pathname: '{gs-pathname}'
- '{installer}-project-parameter':
gs-pathname: '{gs-pathname}'
@@
-124,6
+127,7
@@
publishers:
- '{installer}-recipients'
publishers:
- '{installer}-recipients'
+ - email-jenkins-admins-on-failure
- job-template:
name: '{installer}-{phase}-daily-{stream}'
- job-template:
name: '{installer}-{phase}-daily-{stream}'
@@
-138,11
+142,6
@@
enabled: true
max-total: 6
option: 'project'
enabled: true
max-total: 6
option: 'project'
- - build-blocker:
- use-build-blocker: true
- blocking-jobs:
- - '{installer}-.*deploy-.*'
- block-level: 'NODE'
scm:
- git-scm
scm:
- git-scm
@@
-157,7
+156,8
@@
- project-parameter:
project: '{project}'
branch: '{branch}'
- project-parameter:
project: '{project}'
branch: '{branch}'
- - 'daisy-defaults'
+ - '{installer}-defaults'
+ - '{slave-label}-defaults'
- string:
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/$PROJECT
- string:
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@
-165,8
+165,6
@@
- string:
name: DEPLOY_SCENARIO
default: 'os-nosdn-nofeature-ha'
- string:
name: DEPLOY_SCENARIO
default: 'os-nosdn-nofeature-ha'
- - 'daisy-defaults'
- - '{slave-label}-defaults'
- '{installer}-project-parameter':
gs-pathname: '{gs-pathname}'
- '{installer}-project-parameter':
gs-pathname: '{gs-pathname}'
@@
-187,8
+185,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-deploy-daily-macro'
- builder:
name: 'daisy-deploy-daily-macro'
@@
-214,6
+211,7
@@
publishers:
- email:
recipients: hu.zhijiang@zte.com.cn lu.yao135@zte.com.cn zhou.ya@zte.com.cn yangyang1@zte.com.cn julienjut@gmail.com
publishers:
- email:
recipients: hu.zhijiang@zte.com.cn lu.yao135@zte.com.cn zhou.ya@zte.com.cn yangyang1@zte.com.cn julienjut@gmail.com
+ - email-jenkins-admins-on-failure
- parameter:
name: 'daisy-project-parameter'
- parameter:
name: 'daisy-project-parameter'