Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[compass] put huawei-pod2 into CI resource pool
[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
eb30004
..
ce500ef
100644
(file)
--- a/
jjb/compass4nfv/compass-ci-jobs.yml
+++ b/
jjb/compass4nfv/compass-ci-jobs.yml
@@
-10,8
+10,8
@@
stream: master
branch: '{stream}'
gs-pathname: ''
stream: master
branch: '{stream}'
gs-pathname: ''
- brahmaputra: &brahmaputra
- stream:
brahmaputra
+ colorado: &colorado
+ stream:
colorado
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
#--------------------------------
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
#--------------------------------
@@
-31,15
+31,15
@@
- baremetal:
slave-label: compass-baremetal
os-version: 'trusty'
- baremetal:
slave-label: compass-baremetal
os-version: 'trusty'
- <<: *
brahmaputra
+ <<: *
colorado
- virtual:
slave-label: compass-virtual
os-version: 'trusty'
- virtual:
slave-label: compass-virtual
os-version: 'trusty'
- <<: *
brahmaputra
+ <<: *
colorado
#--------------------------------
# master
#--------------------------------
#--------------------------------
# master
#--------------------------------
- - huawei-pod
2
:
+ - huawei-pod
5
:
slave-label: '{pod}'
os-version: 'centos7'
<<: *master
slave-label: '{pod}'
os-version: 'centos7'
<<: *master
@@
-48,27
+48,35
@@
- 'os-nosdn-nofeature-ha':
disabled: false
auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
- 'os-nosdn-nofeature-ha':
disabled: false
auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+ openstack-os-version: ''
- 'os-odl_l2-nofeature-ha':
disabled: false
auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
- 'os-odl_l2-nofeature-ha':
disabled: false
auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+ openstack-os-version: ''
- 'os-odl_l3-nofeature-ha':
disabled: false
auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
- 'os-odl_l3-nofeature-ha':
disabled: false
auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+ openstack-os-version: ''
- 'os-onos-nofeature-ha':
disabled: false
auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
- 'os-onos-nofeature-ha':
disabled: false
auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+ openstack-os-version: ''
- 'os-ocl-nofeature-ha':
disabled: false
auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
- 'os-ocl-nofeature-ha':
disabled: false
auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+ openstack-os-version: ''
- 'os-onos-sfc-ha':
disabled: false
auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
- 'os-onos-sfc-ha':
disabled: false
auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+ openstack-os-version: ''
- 'os-odl_l2-moon-ha':
disabled: false
auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
- 'os-odl_l2-moon-ha':
disabled: false
auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+ openstack-os-version: 'xenial'
- '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'
+ openstack-os-version: ''
jobs:
- 'compass-{scenario}-{pod}-daily-{stream}'
jobs:
- 'compass-{scenario}-{pod}-daily-{stream}'
@@
-91,6
+99,7
@@
use-build-blocker: true
blocking-jobs:
- 'compass-os-.*?-{pod}-daily-.*?'
use-build-blocker: true
blocking-jobs:
- 'compass-os-.*?-{pod}-daily-.*?'
+ - 'compass-os-.*?-baremetal-daily-.*?'
- 'compass-verify-[^-]*'
block-level: 'NODE'
- 'compass-verify-[^-]*'
block-level: 'NODE'
@@
-122,6
+131,7
@@
predefined-parameters: |
DEPLOY_SCENARIO={scenario}
COMPASS_OS_VERSION={os-version}
predefined-parameters: |
DEPLOY_SCENARIO={scenario}
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:
@@
-236,35
+246,35
@@
# trigger macros
########################
- trigger:
# trigger macros
########################
- trigger:
- name: 'compass-os-nosdn-nofeature-ha-huawei-pod
2
-master-trigger'
+ name: 'compass-os-nosdn-nofeature-ha-huawei-pod
5
-master-trigger'
triggers:
- timed: '0 19 * * *'
- trigger:
triggers:
- timed: '0 19 * * *'
- trigger:
- name: 'compass-os-odl_l2-nofeature-ha-huawei-pod
2
-master-trigger'
+ name: 'compass-os-odl_l2-nofeature-ha-huawei-pod
5
-master-trigger'
triggers:
- timed: '0 23 * * *'
- trigger:
triggers:
- timed: '0 23 * * *'
- trigger:
- name: 'compass-os-odl_l3-nofeature-ha-huawei-pod
2
-master-trigger'
+ name: 'compass-os-odl_l3-nofeature-ha-huawei-pod
5
-master-trigger'
triggers:
- timed: '0 15 * * *'
- trigger:
triggers:
- timed: '0 15 * * *'
- trigger:
- name: 'compass-os-onos-nofeature-ha-huawei-pod
2
-master-trigger'
+ name: 'compass-os-onos-nofeature-ha-huawei-pod
5
-master-trigger'
triggers:
triggers:
- - timed: ''
+ - timed: '
0 7 * * *
'
- trigger:
- trigger:
- name: 'compass-os-ocl-nofeature-ha-huawei-pod
2
-master-trigger'
+ name: 'compass-os-ocl-nofeature-ha-huawei-pod
5
-master-trigger'
triggers:
- timed: '0 11 * * *'
- trigger:
triggers:
- timed: '0 11 * * *'
- trigger:
- name: 'compass-os-onos-sfc-ha-huawei-pod
2
-master-trigger'
+ name: 'compass-os-onos-sfc-ha-huawei-pod
5
-master-trigger'
triggers:
triggers:
- - timed: ''
+ - timed: '
0 3 * * *
'
- trigger:
- trigger:
- name: 'compass-os-odl_l2-moon-ha-huawei-pod
2
-master-trigger'
+ name: 'compass-os-odl_l2-moon-ha-huawei-pod
5
-master-trigger'
triggers:
- timed: ''
- trigger:
triggers:
- timed: ''
- trigger:
- name: 'compass-os-nosdn-kvm-ha-huawei-pod
2
-master-trigger'
+ name: 'compass-os-nosdn-kvm-ha-huawei-pod
5
-master-trigger'
triggers:
- timed: ''
triggers:
- timed: ''
@@
-302,35
+312,35
@@
- timed: ''
- trigger:
- timed: ''
- trigger:
- name: 'compass-os-nosdn-nofeature-ha-baremetal-
brahmaputra
-trigger'
+ name: 'compass-os-nosdn-nofeature-ha-baremetal-
colorado
-trigger'
triggers:
- timed: ''
- trigger:
triggers:
- timed: ''
- trigger:
- name: 'compass-os-odl_l2-nofeature-ha-baremetal-
brahmaputra
-trigger'
+ name: 'compass-os-odl_l2-nofeature-ha-baremetal-
colorado
-trigger'
triggers:
- timed: ''
- trigger:
triggers:
- timed: ''
- trigger:
- name: 'compass-os-odl_l3-nofeature-ha-baremetal-
brahmaputra
-trigger'
+ name: 'compass-os-odl_l3-nofeature-ha-baremetal-
colorado
-trigger'
triggers:
- timed: ''
- trigger:
triggers:
- timed: ''
- trigger:
- name: 'compass-os-onos-nofeature-ha-baremetal-
brahmaputra
-trigger'
+ name: 'compass-os-onos-nofeature-ha-baremetal-
colorado
-trigger'
triggers:
- timed: ''
- trigger:
triggers:
- timed: ''
- trigger:
- name: 'compass-os-ocl-nofeature-ha-baremetal-
brahmaputra
-trigger'
+ name: 'compass-os-ocl-nofeature-ha-baremetal-
colorado
-trigger'
triggers:
- timed: ''
- trigger:
triggers:
- timed: ''
- trigger:
- name: 'compass-os-onos-sfc-ha-baremetal-
brahmaputra
-trigger'
+ name: 'compass-os-onos-sfc-ha-baremetal-
colorado
-trigger'
triggers:
- timed: ''
- trigger:
triggers:
- timed: ''
- trigger:
- name: 'compass-os-odl_l2-moon-ha-baremetal-
brahmaputra
-trigger'
+ name: 'compass-os-odl_l2-moon-ha-baremetal-
colorado
-trigger'
triggers:
- timed: ''
- trigger:
triggers:
- timed: ''
- trigger:
- name: 'compass-os-nosdn-kvm-ha-baremetal-
brahmaputra
-trigger'
+ name: 'compass-os-nosdn-kvm-ha-baremetal-
colorado
-trigger'
triggers:
- timed: ''
triggers:
- timed: ''
@@
-368,34
+378,34
@@
- timed: ''
- trigger:
- timed: ''
- trigger:
- name: 'compass-os-nosdn-nofeature-ha-virtual-
brahmaputra
-trigger'
+ name: 'compass-os-nosdn-nofeature-ha-virtual-
colorado
-trigger'
triggers:
triggers:
- - timed: ''
+ - timed: '
0 21 * * *
'
- trigger:
- trigger:
- name: 'compass-os-odl_l2-nofeature-ha-virtual-
brahmaputra
-trigger'
+ name: 'compass-os-odl_l2-nofeature-ha-virtual-
colorado
-trigger'
triggers:
triggers:
- - timed: ''
+ - timed: '
0 20 * * *
'
- trigger:
- trigger:
- name: 'compass-os-odl_l3-nofeature-ha-virtual-
brahmaputra
-trigger'
+ name: 'compass-os-odl_l3-nofeature-ha-virtual-
colorado
-trigger'
triggers:
triggers:
- - timed: ''
+ - timed: '
0 19 * * *
'
- trigger:
- trigger:
- name: 'compass-os-onos-nofeature-ha-virtual-
brahmaputra
-trigger'
+ name: 'compass-os-onos-nofeature-ha-virtual-
colorado
-trigger'
triggers:
triggers:
- - timed: ''
+ - timed: '
0 18 * * *
'
- trigger:
- trigger:
- name: 'compass-os-ocl-nofeature-ha-virtual-
brahmaputra
-trigger'
+ name: 'compass-os-ocl-nofeature-ha-virtual-
colorado
-trigger'
triggers:
- timed: ''
- trigger:
triggers:
- timed: ''
- trigger:
- name: 'compass-os-onos-sfc-ha-virtual-
brahmaputra
-trigger'
+ name: 'compass-os-onos-sfc-ha-virtual-
colorado
-trigger'
triggers:
triggers:
- - timed: ''
+ - timed: '
0 15 * * *
'
- trigger:
- trigger:
- name: 'compass-os-odl_l2-moon-ha-virtual-
brahmaputra
-trigger'
+ name: 'compass-os-odl_l2-moon-ha-virtual-
colorado
-trigger'
triggers:
triggers:
- - timed: ''
+ - timed: '
0 14 * * *
'
- trigger:
- trigger:
- name: 'compass-os-nosdn-kvm-ha-virtual-
brahmaputra
-trigger'
+ name: 'compass-os-nosdn-kvm-ha-virtual-
colorado
-trigger'
triggers:
- timed: ''
triggers:
- timed: ''