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
Merge "Disable stateful and learn modes for L2GW CSIT"
[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 d439307110b2234283798748a42fcd1d5ca6ce49..83d25690b6fba07cbeef0e1d5d8eed5a43ffd37f 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'
@@
-24,17
+26,17
@@
- upstream-transparent:
schedule: ''
sg-mode: 'transparent'
- upstream-transparent:
schedule: ''
sg-mode: 'transparent'
- -
upstream-stateful
:
+ -
gate-transparent
:
schedule: ''
schedule: ''
- sg-mode: 'stateful'
- - upstream-learn:
- schedule: ''
- sg-mode: 'learn'
+ sg-mode: 'transparent'
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'
@@
-45,25
+47,19
@@
karaf-version: karaf3
openstack:
karaf-version: karaf3
openstack:
- - mitaka:
- openstack-branch: 'stable/mitaka'
- odl-ml2-branch: 'stable/mitaka'
- openstack_system_image: 'CentOS 7 - devstack-mitaka - 20170314-2255'
- 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
314-2256
'
+ 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
314-2256
'
+ 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-25 - 20170406-0546'
-
- odl_system_image: 'CentOS 7 - java-builder - 20170403-0948'
+ tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20170516-0740'
enable-networking-l2gw: 'yes'
enable-networking-l2gw: 'yes'