Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
jjb: infra: bifrost-verify.sh: Replace 'exit' with 'return'
[releng.git]
/
jjb
/
compass4nfv
/
compass-ci-jobs.yml
diff --git
a/jjb/compass4nfv/compass-ci-jobs.yml
b/jjb/compass4nfv/compass-ci-jobs.yml
index
0d97fef
..
8800a15
100644
(file)
--- a/
jjb/compass4nfv/compass-ci-jobs.yml
+++ b/
jjb/compass4nfv/compass-ci-jobs.yml
@@
-10,10
+10,12
@@
stream: master
branch: '{stream}'
gs-pathname: ''
stream: master
branch: '{stream}'
gs-pathname: ''
-# colorado: &colorado
-# stream: colorado
-# branch: 'stable/{stream}'
-# gs-pathname: '/{stream}'
+ disabled: false
+ danube: &danube
+ stream: danube
+ branch: 'stable/{stream}'
+ gs-pathname: '/{stream}'
+ disabled: true
#--------------------------------
# POD, INSTALLER, AND BRANCH MAPPING
#--------------------------------
#--------------------------------
# POD, INSTALLER, AND BRANCH MAPPING
#--------------------------------
@@
-22,20
+24,20
@@
pod:
- baremetal:
slave-label: compass-baremetal
pod:
- baremetal:
slave-label: compass-baremetal
- os-version: '
trusty
'
+ os-version: '
xenial
'
<<: *master
- virtual:
slave-label: compass-virtual
<<: *master
- virtual:
slave-label: compass-virtual
- os-version: '
trusty
'
+ os-version: '
xenial
'
<<: *master
<<: *master
-
#
- baremetal:
-
#
slave-label: compass-baremetal
-
#
os-version: 'trusty'
-# <<: *colorado
-
#
- virtual:
-
#
slave-label: compass-virtual
-
#
os-version: 'trusty'
-# <<: *colorado
+ - baremetal:
+ slave-label: compass-baremetal
+ os-version: 'trusty'
+ <<: *danube
+ - virtual:
+ slave-label: compass-virtual
+ os-version: 'trusty'
+ <<: *danube
#--------------------------------
# master
#--------------------------------
#--------------------------------
# master
#--------------------------------
@@
-80,6
+82,8
@@
- job-template:
name: 'compass-{scenario}-{pod}-daily-{stream}'
- job-template:
name: 'compass-{scenario}-{pod}-daily-{stream}'
+ disabled: '{obj:disabled}'
+
concurrent: true
properties:
concurrent: true
properties:
@@
-190,6
+194,8
@@
parameters:
- project-parameter:
project: '{project}'
parameters:
- project-parameter:
project: '{project}'
+ - gerrit-parameter:
+ branch: '{branch}'
- compass-ci-parameter:
installer: '{installer}'
gs-pathname: '{gs-pathname}'
- compass-ci-parameter:
installer: '{installer}'
gs-pathname: '{gs-pathname}'
@@
-197,10
+203,7
@@
- '{installer}-defaults'
scm:
- '{installer}-defaults'
scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
+ - git-scm
wrappers:
- build-name:
wrappers:
- build-name:
@@
-238,9
+241,7
@@
- choice:
name: COMPASS_OPENSTACK_VERSION
choices:
- choice:
name: COMPASS_OPENSTACK_VERSION
choices:
- - 'mitaka'
- 'newton'
- 'newton'
- - 'liberty'
########################
# trigger macros
########################
# trigger macros
@@
-312,35
+313,35
@@
- timed: ''
- trigger:
- timed: ''
- trigger:
- name: 'compass-os-nosdn-nofeature-ha-baremetal-
colorado
-trigger'
+ name: 'compass-os-nosdn-nofeature-ha-baremetal-
danube
-trigger'
triggers:
- timed: ''
- trigger:
triggers:
- timed: ''
- trigger:
- name: 'compass-os-odl_l2-nofeature-ha-baremetal-
colorado
-trigger'
+ name: 'compass-os-odl_l2-nofeature-ha-baremetal-
danube
-trigger'
triggers:
- timed: ''
- trigger:
triggers:
- timed: ''
- trigger:
- name: 'compass-os-odl_l3-nofeature-ha-baremetal-
colorado
-trigger'
+ name: 'compass-os-odl_l3-nofeature-ha-baremetal-
danube
-trigger'
triggers:
- timed: ''
- trigger:
triggers:
- timed: ''
- trigger:
- name: 'compass-os-onos-nofeature-ha-baremetal-
colorado
-trigger'
+ name: 'compass-os-onos-nofeature-ha-baremetal-
danube
-trigger'
triggers:
- timed: ''
- trigger:
triggers:
- timed: ''
- trigger:
- name: 'compass-os-ocl-nofeature-ha-baremetal-
colorado
-trigger'
+ name: 'compass-os-ocl-nofeature-ha-baremetal-
danube
-trigger'
triggers:
- timed: ''
- trigger:
triggers:
- timed: ''
- trigger:
- name: 'compass-os-onos-sfc-ha-baremetal-
colorado
-trigger'
+ name: 'compass-os-onos-sfc-ha-baremetal-
danube
-trigger'
triggers:
- timed: ''
- trigger:
triggers:
- timed: ''
- trigger:
- name: 'compass-os-odl_l2-moon-ha-baremetal-
colorado
-trigger'
+ name: 'compass-os-odl_l2-moon-ha-baremetal-
danube
-trigger'
triggers:
- timed: ''
- trigger:
triggers:
- timed: ''
- trigger:
- name: 'compass-os-nosdn-kvm-ha-baremetal-
colorado
-trigger'
+ name: 'compass-os-nosdn-kvm-ha-baremetal-
danube
-trigger'
triggers:
- timed: ''
triggers:
- timed: ''
@@
-378,34
+379,34
@@
- timed: ''
- trigger:
- timed: ''
- trigger:
- name: 'compass-os-nosdn-nofeature-ha-virtual-
colorado
-trigger'
+ name: 'compass-os-nosdn-nofeature-ha-virtual-
danube
-trigger'
triggers:
- timed: '0 21 * * *'
- trigger:
triggers:
- timed: '0 21 * * *'
- trigger:
- name: 'compass-os-odl_l2-nofeature-ha-virtual-
colorado
-trigger'
+ name: 'compass-os-odl_l2-nofeature-ha-virtual-
danube
-trigger'
triggers:
- timed: '0 20 * * *'
- trigger:
triggers:
- timed: '0 20 * * *'
- trigger:
- name: 'compass-os-odl_l3-nofeature-ha-virtual-
colorado
-trigger'
+ name: 'compass-os-odl_l3-nofeature-ha-virtual-
danube
-trigger'
triggers:
- timed: '0 19 * * *'
- trigger:
triggers:
- timed: '0 19 * * *'
- trigger:
- name: 'compass-os-onos-nofeature-ha-virtual-
colorado
-trigger'
+ name: 'compass-os-onos-nofeature-ha-virtual-
danube
-trigger'
triggers:
- timed: '0 18 * * *'
- trigger:
triggers:
- timed: '0 18 * * *'
- trigger:
- name: 'compass-os-ocl-nofeature-ha-virtual-
colorado
-trigger'
+ name: 'compass-os-ocl-nofeature-ha-virtual-
danube
-trigger'
triggers:
- timed: ''
- trigger:
triggers:
- timed: ''
- trigger:
- name: 'compass-os-onos-sfc-ha-virtual-
colorado
-trigger'
+ name: 'compass-os-onos-sfc-ha-virtual-
danube
-trigger'
triggers:
- timed: '0 15 * * *'
- trigger:
triggers:
- timed: '0 15 * * *'
- trigger:
- name: 'compass-os-odl_l2-moon-ha-virtual-
colorado
-trigger'
+ name: 'compass-os-odl_l2-moon-ha-virtual-
danube
-trigger'
triggers:
- timed: '0 14 * * *'
- trigger:
triggers:
- timed: '0 14 * * *'
- trigger:
- name: 'compass-os-nosdn-kvm-ha-virtual-
colorado
-trigger'
+ name: 'compass-os-nosdn-kvm-ha-virtual-
danube
-trigger'
triggers:
- timed: ''
triggers:
- timed: ''