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] adaption for danube
[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
d806195
..
237f894
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
+ disabled: false
+ danube: &danube
+ stream: danube
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
+ disabled: false
#--------------------------------
# POD, INSTALLER, AND BRANCH MAPPING
#--------------------------------
#--------------------------------
# POD, INSTALLER, AND BRANCH MAPPING
#--------------------------------
@@
-22,25
+24,25
@@
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
- baremetal:
slave-label: compass-baremetal
<<: *master
- baremetal:
slave-label: compass-baremetal
- os-version: '
trusty
'
- <<: *
colorado
+ os-version: '
xenial
'
+ <<: *
danube
- virtual:
slave-label: compass-virtual
- virtual:
slave-label: compass-virtual
- os-version: '
trusty
'
- <<: *
colorado
+ os-version: '
xenial
'
+ <<: *
danube
#--------------------------------
# master
#--------------------------------
#--------------------------------
# master
#--------------------------------
- -
huawei-pod5
:
- slave-label: '
{pod}
'
+ -
baremetal-centos
:
+ slave-label: '
intel-pod8
'
os-version: 'centos7'
<<: *master
os-version: 'centos7'
<<: *master
@@
-48,35
+50,31
@@
- '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: ''
+ - '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}'
@@
-88,9
+86,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
@@
-110,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}'
@@
-131,7
+133,6
@@
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:
@@
-159,7
+160,7
@@
#dovetail only master by now, not sync with A/B/C branches
#here the stream means the SUT stream, dovetail stream is defined in its own job
- trigger-builds:
#dovetail only master by now, not sync with A/B/C branches
#here the stream means the SUT stream, dovetail stream is defined in its own job
- trigger-builds:
- - project: 'dovetail-compass-{pod}-
basic
-{stream}'
+ - project: 'dovetail-compass-{pod}-
debug
-{stream}'
current-parameters: false
predefined-parameters:
DEPLOY_SCENARIO={scenario}
current-parameters: false
predefined-parameters:
DEPLOY_SCENARIO={scenario}
@@
-178,6
+179,7
@@
concurrent: true
properties:
concurrent: true
properties:
+ - logrotate-default
- throttle:
enabled: true
max-per-node: 1
- throttle:
enabled: true
max-per-node: 1
@@
-199,6
+201,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}'
@@
-206,10
+209,7
@@
- '{installer}-defaults'
scm:
- '{installer}-defaults'
scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
+ - git-scm
wrappers:
- build-name:
wrappers:
- build-name:
@@
-224,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
########################
@@
-248,47
+242,44
@@
name: COMPASS_OPENSTACK_VERSION
choices:
- 'newton'
name: COMPASS_OPENSTACK_VERSION
choices:
- 'newton'
- - 'mitaka'
- - 'liberty'
- - choice:
- name: COMPASS_OS_VERSION_OPTION
- choices:
- - ''
- - 'xenial'
########################
# 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: ''
@@
-296,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:
@@
-326,35
+321,39
@@
- timed: ''
- trigger:
- timed: ''
- trigger:
- name: 'compass-os-nosdn-nofeature-ha-baremetal-
colorado
-trigger'
+ name: 'compass-os-nosdn-nofeature-ha-baremetal-
danube
-trigger'
triggers:
triggers:
- - timed: ''
+ - timed: '
0 9 * * *
'
- trigger:
- trigger:
- name: 'compass-os-
odl_l2-nofeature-ha-baremetal-colorado
-trigger'
+ name: 'compass-os-
nosdn-openo-ha-baremetal-danube
-trigger'
triggers:
triggers:
- - timed: ''
+ - timed: '
0 13 * * *
'
- trigger:
- trigger:
- name: 'compass-os-odl_l
3-nofeature-ha-baremetal-colorado
-trigger'
+ name: 'compass-os-odl_l
2-nofeature-ha-baremetal-danube
-trigger'
triggers:
triggers:
- - timed: ''
+ - timed: '
0 17 * * *
'
- trigger:
- trigger:
- name: 'compass-os-o
nos-nofeature-ha-baremetal-colorado
-trigger'
+ name: 'compass-os-o
dl_l3-nofeature-ha-baremetal-danube
-trigger'
triggers:
triggers:
- - timed: ''
+ - timed: '
0 21 * * *
'
- trigger:
- trigger:
- name: 'compass-os-o
cl-nofeature-ha-baremetal-colorado
-trigger'
+ name: 'compass-os-o
nos-nofeature-ha-baremetal-danube
-trigger'
triggers:
triggers:
- - timed: ''
+ - timed: '
0 1 * * *
'
- trigger:
- trigger:
- name: 'compass-os-onos-sfc-ha-baremetal-colorado-trigger'
+ name: 'compass-os-ocl-nofeature-ha-baremetal-danube-trigger'
+ triggers:
+ - timed: '0 5 * * *'
+- 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: ''
@@
-362,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:
@@
-392,34
+395,38
@@
- 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-nosdn-openo-ha-virtual-danube-trigger'
+ triggers:
+ - timed: '0 22 * * *'
+- 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: ''