X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetvirt%2Fnetvirt-csit-hwvtep-openstack.yaml;h=9793e3b2dbcf94381f365a3e76eb7061bac09ca3;hb=9df3f548230c398ce40a07501a6c2fa58f77134f;hp=6e794b77eb602ddb5c14b0066c32d9432fc9c6ee;hpb=f348f1c730ed9939f7b5059ac5a29b2e82036456;p=releng%2Fbuilder.git

diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
index 6e794b77e..9793e3b2d 100644
--- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@ -2,7 +2,7 @@
 - project:
     name: netvirt-csit-hwvtep-openstack-integration-oxygen
     jobs:
-      - '{project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream}'
+      - inttest-csit-hwvtep-openstack
 
     project: 'netvirt'
     stream: 'oxygen'
@@ -11,13 +11,13 @@
     topology:
       - 1node:
           openstack_system1_count: 1
-          openstack_system2_count: 2
+          openstack_system2_count: 1
           odl_system_count: 1
           enable-haproxy: 'no'
           install-features: 'odl-netvirt-openstack'
       - 3node:
           openstack_system1_count: 1
-          openstack_system2_count: 3
+          openstack_system2_count: 1
           odl_system_count: 3
           enable-haproxy: 'yes'
           install-features: 'odl-jolokia,odl-netvirt-openstack'
@@ -54,7 +54,7 @@
     enable-openstack-compute-services: 'placement-client'
     security-group-mode: '{sg-mode}'
     tools_system_count: 2
-    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-26 - 20171016-0212'
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847
 
     # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
     enable-networking-l2gw: 'yes'
@@ -62,7 +62,7 @@
 - project:
     name: netvirt-csit-hwvtep-openstack-integration-nitrogen
     jobs:
-      - '{project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream}'
+      - inttest-csit-hwvtep-openstack
 
     project: 'netvirt'
     stream: 'nitrogen'
@@ -71,13 +71,13 @@
     topology:
       - 1node:
           openstack_system1_count: 1
-          openstack_system2_count: 2
+          openstack_system2_count: 1
           odl_system_count: 1
           enable-haproxy: 'no'
           install-features: 'odl-netvirt-openstack'
       - 3node:
           openstack_system1_count: 1
-          openstack_system2_count: 3
+          openstack_system2_count: 1
           odl_system_count: 3
           enable-haproxy: 'yes'
           install-features: 'odl-jolokia,odl-netvirt-openstack'
@@ -116,7 +116,7 @@
     enable-openstack-compute-services: 'placement-client'
     security-group-mode: '{sg-mode}'
     tools_system_count: 2
-    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-26 - 20171016-0212'
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847
 
     # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
     enable-networking-l2gw: 'yes'
@@ -124,7 +124,7 @@
 - project:
     name: netvirt-csit-hwvtep-openstack-integration-carbon
     jobs:
-      - '{project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream}'
+      - inttest-csit-hwvtep-openstack
 
     project: 'netvirt'
 
@@ -135,13 +135,13 @@
     topology:
       - 1node:
           openstack_system1_count: 1
-          openstack_system2_count: 2
+          openstack_system2_count: 1
           odl_system_count: 1
           enable-haproxy: 'no'
           install-features: 'odl-netvirt-openstack'
       - 3node:
           openstack_system1_count: 1
-          openstack_system2_count: 3
+          openstack_system2_count: 1
           odl_system_count: 3
           enable-haproxy: 'yes'
           install-features: 'odl-jolokia,odl-netvirt-openstack'
@@ -174,7 +174,7 @@
     enable-openstack-compute-services: 'placement-client'
     security-group-mode: '{sg-mode}'
     tools_system_count: 2
-    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-26 - 20171016-0212'
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847
 
     # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
     enable-networking-l2gw: 'yes'