Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
xci: Introduce XCI_LOOP variable to control what to do properly
[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
754b24e
..
237f894
100644
(file)
--- a/
jjb/compass4nfv/compass-ci-jobs.yml
+++ b/
jjb/compass4nfv/compass-ci-jobs.yml
@@
-15,7
+15,7
@@
stream: danube
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
stream: danube
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
- disabled:
tru
e
+ disabled:
fals
e
#--------------------------------
# POD, INSTALLER, AND BRANCH MAPPING
#--------------------------------
#--------------------------------
# POD, INSTALLER, AND BRANCH MAPPING
#--------------------------------
@@
-32,17
+32,17
@@
<<: *master
- baremetal:
slave-label: compass-baremetal
<<: *master
- baremetal:
slave-label: compass-baremetal
- os-version: '
trusty
'
+ os-version: '
xenial
'
<<: *danube
- virtual:
slave-label: compass-virtual
<<: *danube
- virtual:
slave-label: compass-virtual
- os-version: '
trusty
'
+ os-version: '
xenial
'
<<: *danube
#--------------------------------
# master
#--------------------------------
<<: *danube
#--------------------------------
# master
#--------------------------------
- -
huawei-pod5
:
- slave-label: '
{pod}
'
+ -
baremetal-centos
:
+ slave-label: '
intel-pod8
'
os-version: 'centos7'
<<: *master
os-version: 'centos7'
<<: *master
@@
-71,6
+71,10
@@
- 'os-nosdn-kvm-ha':
disabled: false
auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
- 'os-nosdn-kvm-ha':
disabled: false
auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+ - 'os-nosdn-openo-ha':
+ disabled: false
+ auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+
jobs:
- 'compass-{scenario}-{pod}-daily-{stream}'
jobs:
- 'compass-{scenario}-{pod}-daily-{stream}'
@@
-107,6
+111,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}'
@@
-196,7
+201,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}'
@@
-220,12
+224,6
@@
- shell:
!include-raw-escape: ./compass-deploy.sh
- shell:
!include-raw-escape: ./compass-deploy.sh
- publishers:
- - archive:
- artifacts: 'ansible.log'
- allow-empty: 'true'
- fingerprint: true
-
########################
# parameter macros
########################
########################
# parameter macros
########################
@@
-249,35
+247,39
@@
# trigger macros
########################
- trigger:
# trigger macros
########################
- trigger:
- name: 'compass-os-nosdn-nofeature-ha-
huawei-pod5
-master-trigger'
+ name: 'compass-os-nosdn-nofeature-ha-
baremetal-centos
-master-trigger'
triggers:
- timed: '0 19 * * *'
- trigger:
triggers:
- timed: '0 19 * * *'
- trigger:
- name: 'compass-os-odl_l2-nofeature-ha-huawei-pod5-master-trigger'
+ name: 'compass-os-nosdn-openo-ha-baremetal-centos-master-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'compass-os-odl_l2-nofeature-ha-baremetal-centos-master-trigger'
triggers:
- timed: '0 23 * * *'
- trigger:
triggers:
- timed: '0 23 * * *'
- trigger:
- name: 'compass-os-odl_l3-nofeature-ha-
huawei-pod5
-master-trigger'
+ name: 'compass-os-odl_l3-nofeature-ha-
baremetal-centos
-master-trigger'
triggers:
- timed: '0 15 * * *'
- trigger:
triggers:
- timed: '0 15 * * *'
- trigger:
- name: 'compass-os-onos-nofeature-ha-
huawei-pod5
-master-trigger'
+ name: 'compass-os-onos-nofeature-ha-
baremetal-centos
-master-trigger'
triggers:
- timed: '0 7 * * *'
- trigger:
triggers:
- timed: '0 7 * * *'
- trigger:
- name: 'compass-os-ocl-nofeature-ha-
huawei-pod5
-master-trigger'
+ name: 'compass-os-ocl-nofeature-ha-
baremetal-centos
-master-trigger'
triggers:
- timed: '0 11 * * *'
- trigger:
triggers:
- timed: '0 11 * * *'
- trigger:
- name: 'compass-os-onos-sfc-ha-
huawei-pod5
-master-trigger'
+ name: 'compass-os-onos-sfc-ha-
baremetal-centos
-master-trigger'
triggers:
- timed: '0 3 * * *'
- trigger:
triggers:
- timed: '0 3 * * *'
- trigger:
- name: 'compass-os-odl_l2-moon-ha-
huawei-pod5
-master-trigger'
+ name: 'compass-os-odl_l2-moon-ha-
baremetal-centos
-master-trigger'
triggers:
- timed: ''
- trigger:
triggers:
- timed: ''
- trigger:
- name: 'compass-os-nosdn-kvm-ha-
huawei-pod5
-master-trigger'
+ name: 'compass-os-nosdn-kvm-ha-
baremetal-centos
-master-trigger'
triggers:
- timed: ''
triggers:
- timed: ''
@@
-285,6
+287,10
@@
name: 'compass-os-nosdn-nofeature-ha-baremetal-master-trigger'
triggers:
- timed: '0 2 * * *'
name: 'compass-os-nosdn-nofeature-ha-baremetal-master-trigger'
triggers:
- timed: '0 2 * * *'
+- trigger:
+ name: 'compass-os-nosdn-openo-ha-baremetal-master-trigger'
+ triggers:
+ - timed: '0 3 * * *'
- trigger:
name: 'compass-os-odl_l2-nofeature-ha-baremetal-master-trigger'
triggers:
- trigger:
name: 'compass-os-odl_l2-nofeature-ha-baremetal-master-trigger'
triggers:
@@
-317,23
+323,27
@@
- trigger:
name: 'compass-os-nosdn-nofeature-ha-baremetal-danube-trigger'
triggers:
- trigger:
name: 'compass-os-nosdn-nofeature-ha-baremetal-danube-trigger'
triggers:
- - timed: ''
+ - timed: '0 9 * * *'
+- trigger:
+ name: 'compass-os-nosdn-openo-ha-baremetal-danube-trigger'
+ triggers:
+ - timed: '0 13 * * *'
- trigger:
name: 'compass-os-odl_l2-nofeature-ha-baremetal-danube-trigger'
triggers:
- trigger:
name: 'compass-os-odl_l2-nofeature-ha-baremetal-danube-trigger'
triggers:
- - timed: ''
+ - timed: '
0 17 * * *
'
- trigger:
name: 'compass-os-odl_l3-nofeature-ha-baremetal-danube-trigger'
triggers:
- trigger:
name: 'compass-os-odl_l3-nofeature-ha-baremetal-danube-trigger'
triggers:
- - timed: ''
+ - timed: '
0 21 * * *
'
- trigger:
name: 'compass-os-onos-nofeature-ha-baremetal-danube-trigger'
triggers:
- trigger:
name: 'compass-os-onos-nofeature-ha-baremetal-danube-trigger'
triggers:
- - timed: ''
+ - timed: '
0 1 * * *
'
- trigger:
name: 'compass-os-ocl-nofeature-ha-baremetal-danube-trigger'
triggers:
- trigger:
name: 'compass-os-ocl-nofeature-ha-baremetal-danube-trigger'
triggers:
- - timed: ''
+ - timed: '
0 5 * * *
'
- trigger:
name: 'compass-os-onos-sfc-ha-baremetal-danube-trigger'
triggers:
- trigger:
name: 'compass-os-onos-sfc-ha-baremetal-danube-trigger'
triggers:
@@
-351,6
+361,10
@@
name: 'compass-os-nosdn-nofeature-ha-virtual-master-trigger'
triggers:
- timed: '0 21 * * *'
name: 'compass-os-nosdn-nofeature-ha-virtual-master-trigger'
triggers:
- timed: '0 21 * * *'
+- trigger:
+ name: 'compass-os-nosdn-openo-ha-virtual-master-trigger'
+ triggers:
+ - timed: '0 22 * * *'
- trigger:
name: 'compass-os-odl_l2-nofeature-ha-virtual-master-trigger'
triggers:
- trigger:
name: 'compass-os-odl_l2-nofeature-ha-virtual-master-trigger'
triggers:
@@
-384,6
+398,10
@@
name: 'compass-os-nosdn-nofeature-ha-virtual-danube-trigger'
triggers:
- timed: '0 21 * * *'
name: 'compass-os-nosdn-nofeature-ha-virtual-danube-trigger'
triggers:
- timed: '0 21 * * *'
+- trigger:
+ name: 'compass-os-nosdn-openo-ha-virtual-danube-trigger'
+ triggers:
+ - timed: '0 22 * * *'
- trigger:
name: 'compass-os-odl_l2-nofeature-ha-virtual-danube-trigger'
triggers:
- trigger:
name: 'compass-os-odl_l2-nofeature-ha-virtual-danube-trigger'
triggers: