Code Review
/
releng
/
builder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add defaults for timed values
[releng/builder.git]
/
jjb
/
netvirt
/
netvirt-csit-hwvtep-openstack.yaml
diff --git
a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
index a1ba108af7cf3088c3f7e6fc24fa5cd66ed9758d..323fa58b17c7f1d4cd40d568189c88d0cfd2f7e0 100644
(file)
--- a/
jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/
jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@
-8,12
+8,14
@@
topology:
- 1node:
topology:
- 1node:
- openstack_system_count: 3
+ openstack_system_count: 1
+ openstack_system2_count: 2
odl_system_count: 1
enable-haproxy: 'no'
install-features: 'odl-netvirt-openstack'
- 3node:
odl_system_count: 1
enable-haproxy: 'no'
install-features: 'odl-netvirt-openstack'
- 3node:
- openstack_system_count: 4
+ openstack_system_count: 1
+ openstack_system2_count: 3
odl_system_count: 3
enable-haproxy: 'yes'
install-features: 'odl-jolokia,odl-netvirt-openstack'
odl_system_count: 3
enable-haproxy: 'yes'
install-features: 'odl-jolokia,odl-netvirt-openstack'
@@
-21,20
+23,18
@@
testplan: '{project}-{topology}-l2gw-openstack.txt'
functionality:
testplan: '{project}-{topology}-l2gw-openstack.txt'
functionality:
- - upstream-transparent:
- schedule: ''
- sg-mode: 'transparent'
- upstream-stateful:
- upstream-stateful:
- schedule: ''
sg-mode: 'stateful'
sg-mode: 'stateful'
- - upstream-learn:
- schedule: ''
- sg-mode: 'learn'
+ - gate-stateful:
+ sg-mode: 'stateful'
stream:
stream:
- -
nitro
gen:
+ -
oxy
gen:
branch: 'master'
jre: 'openjdk8'
branch: 'master'
jre: 'openjdk8'
+ - nitrogen:
+ branch: 'stable/nitrogen'
+ jre: 'openjdk8'
- carbon:
branch: 'stable/carbon'
jre: 'openjdk8'
- carbon:
branch: 'stable/carbon'
jre: 'openjdk8'
@@
-48,19
+48,20
@@
- newton:
openstack-branch: 'stable/newton'
odl-ml2-branch: 'stable/newton'
- newton:
openstack-branch: 'stable/newton'
odl-ml2-branch: 'stable/newton'
- openstack_system_image: 'CentOS 7 - devstack-newton - 20170
609-0220
'
+ openstack_system_image: 'CentOS 7 - devstack-newton - 20170
808-0528
'
- newton-nodl-v2:
openstack-branch: 'stable/newton'
odl-ml2-branch: 'stable/newton'
odl-ml2-driver-version: 'v2'
- newton-nodl-v2:
openstack-branch: 'stable/newton'
odl-ml2-branch: 'stable/newton'
odl-ml2-driver-version: 'v2'
- openstack_system_image: 'CentOS 7 - devstack-newton - 20170
609-0220
'
+ openstack_system_image: 'CentOS 7 - devstack-newton - 20170
808-0528
'
tools_system_count: 2
tools_system_count: 2
- tools_system_image: 'Ubuntu 16.04 - mininet-ovs-2
5 - 20170516-0740
'
+ tools_system_image: 'Ubuntu 16.04 - mininet-ovs-2
6 - 20170829-0548
'
+ # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
enable-networking-l2gw: 'yes'
enable-networking-l2gw: 'yes'
- enable-openstack-services: '
q-svc,q-dhcp,q-meta,n-cauth,tempest,l2gw-plugin
'
+ enable-openstack-services: '
l2gw-plugin,neutron,nova,tempest
'
security-group-mode: '{sg-mode}'
security-group-mode: '{sg-mode}'