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] undo colorado CI build since we have release colorado3.0
[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
eb91131
..
0d97fef
100644
(file)
--- a/
jjb/compass4nfv/compass-ci-jobs.yml
+++ b/
jjb/compass4nfv/compass-ci-jobs.yml
@@
-10,10
+10,10
@@
stream: master
branch: '{stream}'
gs-pathname: ''
stream: master
branch: '{stream}'
gs-pathname: ''
- colorado: &colorado
- stream: colorado
- branch: 'stable/{stream}'
- gs-pathname: '/{stream}'
+
#
colorado: &colorado
+
#
stream: colorado
+
#
branch: 'stable/{stream}'
+
#
gs-pathname: '/{stream}'
#--------------------------------
# POD, INSTALLER, AND BRANCH MAPPING
#--------------------------------
#--------------------------------
# POD, INSTALLER, AND BRANCH MAPPING
#--------------------------------
@@
-28,14
+28,14
@@
slave-label: compass-virtual
os-version: 'trusty'
<<: *master
slave-label: compass-virtual
os-version: 'trusty'
<<: *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'
+
#
<<: *colorado
+
#
- virtual:
+
#
slave-label: compass-virtual
+
#
os-version: 'trusty'
+
#
<<: *colorado
#--------------------------------
# master
#--------------------------------
#--------------------------------
# master
#--------------------------------
@@
-48,35
+48,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}'
@@
-131,7
+123,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
+150,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}
@@
-248,12
+239,8
@@
name: COMPASS_OPENSTACK_VERSION
choices:
- 'mitaka'
name: COMPASS_OPENSTACK_VERSION
choices:
- 'mitaka'
+ - 'newton'
- 'liberty'
- 'liberty'
- - choice:
- name: COMPASS_OS_VERSION_OPTION
- choices:
- - ''
- - 'xenial'
########################
# trigger macros
########################
# trigger macros