X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetvirt%2Fnetvirt-csit-hwvtep-openstack.yaml;h=83d25690b6fba07cbeef0e1d5d8eed5a43ffd37f;hb=5928852042ebaff026326d070fb80f711201d6f0;hp=b16a5019120a79b5eb316cecf79cc327f1d6719c;hpb=000d55d6fc496d46411567f3a56c488cf076ac86;p=releng%2Fbuilder.git

diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
index b16a50191..83d25690b 100644
--- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@ -8,12 +8,14 @@
 
     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:
-          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'
@@ -24,17 +26,17 @@
       - upstream-transparent:
           schedule: ''
           sg-mode: 'transparent'
-      - upstream-stateful:
+      - gate-transparent:
           schedule: ''
-          sg-mode: 'stateful'
-      - upstream-learn:
-          schedule: ''
-          sg-mode: 'learn'
+          sg-mode: 'transparent'
 
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
@@ -48,18 +50,16 @@
       - newton:
           openstack-branch: 'stable/newton'
           odl-ml2-branch: 'stable/newton'
-          openstack_system_image: 'CentOS 7 - devstack-newton - 20170314-2256'
+          openstack_system_image: 'CentOS 7 - devstack-newton - 20170808-0528'
       - newton-nodl-v2:
           openstack-branch: 'stable/newton'
           odl-ml2-branch: 'stable/newton'
           odl-ml2-driver-version: 'v2'
-          openstack_system_image: 'CentOS 7 - devstack-newton - 20170314-2256'
+          openstack_system_image: 'CentOS 7 - devstack-newton - 20170808-0528'
 
     tools_system_count: 2
 
-    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20170406-0546'
-
-    odl_system_image: 'CentOS 7 - java-builder - 20170503-2232'
+    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20170516-0740'
 
     enable-networking-l2gw: 'yes'