Merge "Fix broken log collections"

[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 8ee53dc44ebe31927684037cf0f00666e11389f9..5c99a9914a68244ee829dbf6b2eb1a6e8d52a6fd 100644 (file)
--- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@ -34,30 +34,27 @@
       - ocata:
           openstack-branch: 'stable/ocata'
           odl-ml2-branch: 'stable/ocata'
-          devstack-hash: '8cb43d098ca88ce57ec216423c009cccd07f1299'
-          openstack_system_image: 'CentOS 7 - devstack-ocata - 20171016-0219'
-          openstack_system2_image: 'CentOS 7 - devstack-ocata - 20171016-0219'
+          openstack_system_image: '{openstack_system_image_ocata}'
+          openstack_system2_image: '{openstack_system_image_ocata}'
       - pike:
           openstack-branch: 'stable/pike'
-          devstack-hash: 'c2bb1020ac4f18df5aa90a13f3b6ee8eb2c15d65'
           odl-ml2-branch: 'stable/pike'
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: 'CentOS 7 - devstack-pike - 20171014-2148'
-          openstack_system2_image: 'CentOS 7 - devstack-pike - 20171014-2148'
+          openstack_system_image: '{openstack_system_image_pike}'
+          openstack_system2_image: '{openstack_system_image_pike}'
       - queens:
           openstack-branch: 'master'
-          devstack-hash: '2d5494cfc57b95b61f8b33240eff65f1a339a53e'
           odl-ml2-branch: 'master'
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: 'CentOS 7 - devstack-pike - 20171014-2148'
-          openstack_system2_image: 'CentOS 7 - devstack-pike - 20171014-2148'
+          openstack_system_image: '{openstack_system_image_pike}'
+          openstack_system2_image: '{openstack_system_image_pike}'
 
     odl-ml2-driver-version: 'v2'
     enable-openstack-services: 'placement-api,l2gw-plugin'
     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'
@@ -99,30 +96,27 @@
       - ocata:
           openstack-branch: 'stable/ocata'
           odl-ml2-branch: 'stable/ocata'
-          devstack-hash: '8cb43d098ca88ce57ec216423c009cccd07f1299'
-          openstack_system_image: 'CentOS 7 - devstack-ocata - 20171016-0219'
-          openstack_system2_image: 'CentOS 7 - devstack-ocata - 20171016-0219'
+          openstack_system_image: '{openstack_system_image_ocata}'
+          openstack_system2_image: '{openstack_system_image_ocata}'
       - pike:
           openstack-branch: 'stable/pike'
-          devstack-hash: 'c2bb1020ac4f18df5aa90a13f3b6ee8eb2c15d65'
           odl-ml2-branch: 'stable/pike'
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: 'CentOS 7 - devstack-pike - 20171014-2148'
-          openstack_system2_image: 'CentOS 7 - devstack-pike - 20171014-2148'
+          openstack_system_image: '{openstack_system_image_pike}'
+          openstack_system2_image: '{openstack_system_image_pike}'
       - queens:
           openstack-branch: 'master'
-          devstack-hash: '2d5494cfc57b95b61f8b33240eff65f1a339a53e'
           odl-ml2-branch: 'master'
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: 'CentOS 7 - devstack-pike - 20171014-2148'
-          openstack_system2_image: 'CentOS 7 - devstack-pike - 20171014-2148'
+          openstack_system_image: '{openstack_system_image_pike}'
+          openstack_system2_image: '{openstack_system_image_pike}'
 
     odl-ml2-driver-version: 'v2'
     enable-openstack-services: 'placement-api,l2gw-plugin'
     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'
@@ -166,23 +160,21 @@
       - ocata:
           openstack-branch: 'stable/ocata'
           odl-ml2-branch: 'stable/ocata'
-          devstack-hash: '8cb43d098ca88ce57ec216423c009cccd07f1299'
-          openstack_system_image: 'CentOS 7 - devstack-ocata - 20171016-0219'
-          openstack_system2_image: 'CentOS 7 - devstack-ocata - 20171016-0219'
+          openstack_system_image: '{openstack_system_image_ocata}'
+          openstack_system2_image: '{openstack_system_image_ocata}'
       - pike:
           openstack-branch: 'stable/pike'
-          devstack-hash: 'c2bb1020ac4f18df5aa90a13f3b6ee8eb2c15d65'
           odl-ml2-branch: 'stable/pike'
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: 'CentOS 7 - devstack-pike - 20171014-2148'
-          openstack_system2_image: 'CentOS 7 - devstack-pike - 20171014-2148'
+          openstack_system_image: '{openstack_system_image_pike}'
+          openstack_system2_image: '{openstack_system_image_pike}'
 
     odl-ml2-driver-version: 'v2'
     enable-openstack-services: 'placement-api,l2gw-plugin'
     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'