X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetvirt%2Fnetvirt-csit-hwvtep-openstack.yaml;h=357f515adccba8589340c024033a094c00d7c98a;hb=41aebdcd7f3ddfd6d1fb6bb7bc007a1591463d72;hp=828cb44ab7163163a1abbe26ac3133621c5d4b17;hpb=9b46087a28de418cf2e0ce5d366346dc9adc3a10;p=releng%2Fbuilder.git

diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
index 828cb44ab..357f515ad 100644
--- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@ -7,7 +7,6 @@
     project: 'netvirt'
     stream: 'oxygen'
     branch: 'master'
-    jre: 'openjdk8'
 
     topology:
       - 1node:
@@ -35,29 +34,30 @@
       - ocata:
           openstack-branch: 'stable/ocata'
           odl-ml2-branch: 'stable/ocata'
-          openstack_system_image: 'CentOS 7 - devstack-ocata - 20170808-0528'
-          openstack_system2_image: 'CentOS 7 - devstack-ocata - 20170808-0528'
+          devstack-hash: '8cb43d098ca88ce57ec216423c009cccd07f1299'
+          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 - 20170901-2223'
-          openstack_system2_image: 'CentOS 7 - devstack-pike - 20170901-2223'
+          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 - 20170901-2223'
-          openstack_system2_image: 'CentOS 7 - devstack-pike - 20170901-2223'
+          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 - 20170829-0548'
+    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-26 - 20171016-0212'
 
     # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
     enable-networking-l2gw: 'yes'
@@ -70,7 +70,6 @@
     project: 'netvirt'
     stream: 'nitrogen'
     branch: 'stable/nitrogen'
-    jre: 'openjdk8'
 
     topology:
       - 1node:
@@ -100,29 +99,30 @@
       - ocata:
           openstack-branch: 'stable/ocata'
           odl-ml2-branch: 'stable/ocata'
-          openstack_system_image: 'CentOS 7 - devstack-ocata - 20170808-0528'
-          openstack_system2_image: 'CentOS 7 - devstack-ocata - 20170808-0528'
+          devstack-hash: '8cb43d098ca88ce57ec216423c009cccd07f1299'
+          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 - 20170901-2223'
-          openstack_system2_image: 'CentOS 7 - devstack-pike - 20170901-2223'
+          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 - 20170901-2223'
-          openstack_system2_image: 'CentOS 7 - devstack-pike - 20170901-2223'
+          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 - 20170829-0548'
+    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-26 - 20171016-0212'
 
     # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
     enable-networking-l2gw: 'yes'
@@ -136,7 +136,6 @@
 
     stream: 'carbon'
     branch: 'stable/carbon'
-    jre: 'openjdk8'
     karaf-version: karaf3
 
     topology:
@@ -167,22 +166,23 @@
       - ocata:
           openstack-branch: 'stable/ocata'
           odl-ml2-branch: 'stable/ocata'
-          openstack_system_image: 'CentOS 7 - devstack-ocata - 20170808-0528'
-          openstack_system2_image: 'CentOS 7 - devstack-ocata - 20170808-0528'
+          devstack-hash: '8cb43d098ca88ce57ec216423c009cccd07f1299'
+          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 - 20170901-2223'
-          openstack_system2_image: 'CentOS 7 - devstack-pike - 20170901-2223'
+          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 - 20170829-0548'
+    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-26 - 20171016-0212'
 
     # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
     enable-networking-l2gw: 'yes'