Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Don't trigger danube branch
[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
57e44e3
..
bcb8910
100644
(file)
--- a/
jjb/daisy4nfv/daisy-project-jobs.yml
+++ b/
jjb/daisy4nfv/daisy-project-jobs.yml
@@
-54,6
+54,8
@@
use-build-blocker: true
blocking-jobs:
- '{installer}-daily-.*'
use-build-blocker: true
blocking-jobs:
- '{installer}-daily-.*'
+ - 'daisy4nfv-merge-build-.*'
+ - 'daisy4nfv-verify-build-.*'
block-level: 'NODE'
scm:
block-level: 'NODE'
scm:
@@
-125,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}'
@@
-161,7
+164,7
@@
description: 'Git URL to use on this Jenkins Slave'
- string:
name: DEPLOY_SCENARIO
description: 'Git URL to use on this Jenkins Slave'
- string:
name: DEPLOY_SCENARIO
- default: 'os-nosdn-nofeature-
no
ha'
+ default: 'os-nosdn-nofeature-ha'
- '{installer}-project-parameter':
gs-pathname: '{gs-pathname}'
- '{installer}-project-parameter':
gs-pathname: '{gs-pathname}'
@@
-182,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'
@@
-209,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'