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 "link from releng jjb to daily JOID job ORCHESTRA-15 ORCHESTRA-16"
[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
1567409
..
bae75dd
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,24
@@
enabled: true
max-total: 4
option: 'project'
enabled: true
max-total: 4
option: 'project'
+ - build-blocker:
+ use-build-blocker: true
+ blocking-jobs:
+ - '{installer}-daily-.*'
+ 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}'
@@
-138,11
+139,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
+153,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
+162,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}'
@@
-196,7
+191,7
@@
- shell:
!include-raw: ./daisy4nfv-download-artifact.sh
- shell:
- shell:
!include-raw: ./daisy4nfv-download-artifact.sh
- shell:
- !include-raw: ./daisy
4nfv
-deploy.sh
+ !include-raw: ./daisy-deploy.sh
- builder:
name: 'daisy-test-daily-macro'
- builder:
name: 'daisy-test-daily-macro'