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 GIT_BRANCH and GERRIT_BRANCH into BRANCH
[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
b4910cf
..
6c9686a
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
#--------------------------------
@@
-28,14
+30,14
@@
slave-label: compass-virtual
os-version: 'xenial'
<<: *master
slave-label: compass-virtual
os-version: 'xenial'
<<: *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,9
+82,12
@@
- 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:
+ - logrotate-default
- throttle:
enabled: true
max-per-node: 1
- throttle:
enabled: true
max-per-node: 1
@@
-102,6
+107,7
@@
parameters:
- project-parameter:
project: '{project}'
parameters:
- project-parameter:
project: '{project}'
+ branch: '{branch}'
- compass-ci-parameter:
installer: '{installer}'
gs-pathname: '{gs-pathname}'
- compass-ci-parameter:
installer: '{installer}'
gs-pathname: '{gs-pathname}'
@@
-169,6
+175,7
@@
concurrent: true
properties:
concurrent: true
properties:
+ - logrotate-default
- throttle:
enabled: true
max-per-node: 1
- throttle:
enabled: true
max-per-node: 1
@@
-190,7
+197,6
@@
parameters:
- project-parameter:
project: '{project}'
parameters:
- project-parameter:
project: '{project}'
- - gerrit-parameter:
branch: '{branch}'
- compass-ci-parameter:
installer: '{installer}'
branch: '{branch}'
- compass-ci-parameter:
installer: '{installer}'
@@
-309,35
+315,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: ''
@@
-375,34
+381,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: ''