Merge "Extract common RPM test builder steps to macro"

[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 6e794b77eb602ddb5c14b0066c32d9432fc9c6ee..8e3a4ac18c06d4b4cedd3c457961b334d95d0ae2 100644 (file)
--- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@ -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'
@@ -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'
@@ -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'