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 "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
d806195
..
754b24e
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: 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
- baremetal:
slave-label: compass-baremetal
os-version: 'trusty'
<<: *master
- baremetal:
slave-label: compass-baremetal
os-version: 'trusty'
- <<: *
colorado
+ <<: *
danube
- virtual:
slave-label: compass-virtual
os-version: 'trusty'
- virtual:
slave-label: compass-virtual
os-version: 'trusty'
- <<: *
colorado
+ <<: *
danube
#--------------------------------
# master
#--------------------------------
#--------------------------------
# master
#--------------------------------
@@
-48,35
+50,27
@@
- '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}'
@@
-88,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
@@
-131,7
+128,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
+155,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
+174,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
+196,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}'
@@
-206,10
+205,7
@@
- '{installer}-defaults'
scm:
- '{installer}-defaults'
scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
+ - git-scm
wrappers:
- build-name:
wrappers:
- build-name:
@@
-248,13
+244,6
@@
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 macros
@@
-326,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: ''
@@
-392,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: ''