Fix typo s/_/- for sfc netvirt csit

[releng/builder.git] / jjb / netvirt / netvirt-csit-multi-openstack.yaml

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index 407dfb61e00df73a343eb8eb186c5cff5f95af37..57be545f5a123963516c79dec2591819d0983343 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -42,8 +42,8 @@
       - ocata:
           openstack-branch: 'stable/ocata'
           odl-ml2-branch: 'stable/ocata'
-          openstack_system_image: 'CentOS 7 - devstack-newton - 20170707-0359'
-          openstack_system2_image: 'CentOS 7 - devstack-newton - 20170707-0359'
+          openstack_system_image: 'CentOS 7 - devstack-ocata - 20170808-0528'
+          openstack_system2_image: 'CentOS 7 - devstack-ocata - 20170808-0528'
       - pike:
           openstack-branch: 'stable/pike'
           devstack-hash: 'c2bb1020ac4f18df5aa90a13f3b6ee8eb2c15d65'
@@ -53,6 +53,7 @@
           openstack_system2_image: 'CentOS 7 - devstack-pike - 20170901-2223'
       - 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'
@@ -60,7 +61,7 @@
 
     odl-ml2-driver-version: 'v2'
     enable-openstack-services: 'placement-api,tempest'
-    enable-openstack-compute_services: 'placement-client'
+    enable-openstack-compute-services: 'placement-client'
     security-group-mode: '{sg-mode}'
 
 - project:
@@ -106,8 +107,8 @@
       - ocata:
           openstack-branch: 'stable/ocata'
           odl-ml2-branch: 'stable/ocata'
-          openstack_system_image: 'CentOS 7 - devstack-newton - 20170707-0359'
-          openstack_system2_image: 'CentOS 7 - devstack-newton - 20170707-0359'
+          openstack_system_image: 'CentOS 7 - devstack-ocata - 20170808-0528'
+          openstack_system2_image: 'CentOS 7 - devstack-ocata - 20170808-0528'
       - pike:
           openstack-branch: 'stable/pike'
           devstack-hash: 'c2bb1020ac4f18df5aa90a13f3b6ee8eb2c15d65'
@@ -117,6 +118,7 @@
           openstack_system2_image: 'CentOS 7 - devstack-pike - 20170901-2223'
       - 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'
@@ -124,7 +126,7 @@
 
     odl-ml2-driver-version: 'v2'
     enable-openstack-services: 'placement-api,tempest'
-    enable-openstack-compute_services: 'placement-client'
+    enable-openstack-compute-services: 'placement-client'
     security-group-mode: '{sg-mode}'
 
 - project:
@@ -168,8 +170,8 @@
       - ocata:
           openstack-branch: 'stable/ocata'
           odl-ml2-branch: 'stable/ocata'
-          openstack_system_image: 'CentOS 7 - devstack-newton - 20170707-0359'
-          openstack_system2_image: 'CentOS 7 - devstack-newton - 20170707-0359'
+          openstack_system_image: 'CentOS 7 - devstack-ocata - 20170808-0528'
+          openstack_system2_image: 'CentOS 7 - devstack-ocata - 20170808-0528'
       - pike:
           openstack-branch: 'stable/pike'
           devstack-hash: 'c2bb1020ac4f18df5aa90a13f3b6ee8eb2c15d65'
@@ -180,7 +182,7 @@
 
     odl-ml2-driver-version: 'v2'
     enable-openstack-services: 'placement-api,tempest'
-    enable-openstack-compute_services: 'placement-client'
+    enable-openstack-compute-services: 'placement-client'
     security-group-mode: '{sg-mode}'
 
 - project:
@@ -261,6 +263,8 @@
 
     functionality:
       - sfc:
+          enable-openstack-services: 'placement-api,tempest'
+          enable-openstack-compute-services: 'placement-client'
           enable-openstack-plugins: 'networking-odl,networking-sfc'
           testplan: '{project}-extensions-sfc.txt'