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 "Trigger test unit execution on verify + Published for jenkins"
[releng.git]
/
jjb
/
compass4nfv
/
compass-project-jobs.yml
diff --git
a/jjb/compass4nfv/compass-project-jobs.yml
b/jjb/compass4nfv/compass-project-jobs.yml
index
da28687
..
5ce9064
100644
(file)
--- a/
jjb/compass4nfv/compass-project-jobs.yml
+++ b/
jjb/compass4nfv/compass-project-jobs.yml
@@
-12,23
+12,32
@@
- master:
branch: '{stream}'
gs-pathname: ''
- master:
branch: '{stream}'
gs-pathname: ''
- -
brahmaputra
:
+ -
colorado
:
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
+ distro:
+ - 'trusty':
+ disabled: false
+ os-version: 'trusty'
+ openstack-os-version: ''
+ - 'centos7':
+ disabled: false
+ os-version: 'centos7'
+ openstack-os-version: ''
jobs:
jobs:
- - 'compass-verify-{stream}'
+ - 'compass-verify-{
distro}-{
stream}'
- 'compass-build-iso-{stream}'
- 'compass-build-ppa-{stream}'
- 'compass-build-iso-{stream}'
- 'compass-build-ppa-{stream}'
- - 'compass-verify-deploy-{stream}'
+ - 'compass-verify-deploy-{
distro}-{
stream}'
########################
# job templates
########################
- job-template:
########################
# job templates
########################
- job-template:
- name: 'compass-verify-{stream}'
+ name: 'compass-verify-{
distro}-{
stream}'
disabled: false
disabled: false
@@
-47,7
+56,7
@@
- build-blocker:
use-build-blocker: true
blocking-jobs:
- build-blocker:
use-build-blocker: true
blocking-jobs:
- - 'compass-verify-[^-]*'
+ - 'compass-verify-[^-]*
-[^-]*
'
- 'compass-os-.*?-virtual-daily-.*?'
block-level: 'NODE'
- 'compass-os-.*?-virtual-daily-.*?'
block-level: 'NODE'
@@
-92,8
+101,11
@@
builders:
- trigger-builds:
builders:
- trigger-builds:
- - project: 'compass-verify-deploy-{stream}'
+ - project: 'compass-verify-deploy-{
distro}-{
stream}'
current-parameters: true
current-parameters: true
+ predefined-parameters: |
+ COMPASS_OS_VERSION={os-version}
+ COMPASS_OS_VERSION_OPTION={openstack-os-version}
same-node: true
block: true
- trigger-builds:
same-node: true
block: true
- trigger-builds:
@@
-109,7
+121,7
@@
unstable-threshold: 'FAILURE'
- job-template:
unstable-threshold: 'FAILURE'
- job-template:
- name: 'compass-verify-deploy-{stream}'
+ name: 'compass-verify-deploy-{
distro}-{
stream}'
concurrent: true
concurrent: true
@@
-160,7
+172,7
@@
- compass-project-parameter:
installer: '{installer}'
gs-pathname: '{gs-pathname}'
- compass-project-parameter:
installer: '{installer}'
gs-pathname: '{gs-pathname}'
- - '
ericsson-build
-defaults'
+ - '
opnfv-build-ubuntu
-defaults'
- '{installer}-defaults'
scm:
- '{installer}-defaults'
scm:
@@
-170,7
+182,7
@@
branch: '{branch}'
triggers:
branch: '{branch}'
triggers:
- - timed: 'H
14
* * *'
+ - timed: 'H
8
* * *'
builders:
- shell:
builders:
- shell: