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 f967350bd0f3a3e4c29a83faf2fb67c23be54e6d..57be545f5a123963516c79dec2591819d0983343 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -25,39 +25,43 @@
 
     functionality:
       - upstream-stateful:
-          schedule: ''
           sg-mode: 'stateful'
       - upstream-stateful-snat-conntrack:
-          schedule: ''
           sg-mode: 'stateful'
           odl-snat-mode: 'conntrack'
       - gate-stateful:
-          schedule: ''
           sg-mode: 'stateful'
       - gate-stateful-snat-conntrack:
-          schedule: ''
           sg-mode: 'stateful'
           odl-snat-mode: 'conntrack'
       - gate-minimal-cluster:
-          schedule: ''
           sg-mode: 'stateful'
           testplan: '{project}-{topology}-minimal-openstack.txt'
 
     openstack:
+      - 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'
       - 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'
       - 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'
 
     odl-ml2-driver-version: 'v2'
-    odl-ml2-port-binding: 'pseudo-agentdb-binding'
     enable-openstack-services: 'placement-api,tempest'
-    enable-openstack-compute_services: 'placement-client'
-    openstack_system_image: 'CentOS 7 - devstack-pike - 20170901-2223'
-    openstack_system2_image: 'CentOS 7 - devstack-pike - 20170901-2223'
+    enable-openstack-compute-services: 'placement-client'
     security-group-mode: '{sg-mode}'
 
 - project:
@@ -86,21 +90,16 @@
 
     functionality:
       - upstream-stateful:
-          schedule: ''
           sg-mode: 'stateful'
       - upstream-stateful-snat-conntrack:
-          schedule: ''
           sg-mode: 'stateful'
           odl-snat-mode: 'conntrack'
       - gate-stateful:
-          schedule: ''
           sg-mode: 'stateful'
       - gate-stateful-snat-conntrack:
-          schedule: ''
           sg-mode: 'stateful'
           odl-snat-mode: 'conntrack'
       - gate-minimal-cluster:
-          schedule: ''
           sg-mode: 'stateful'
           testplan: '{project}-{topology}-minimal-openstack.txt'
 
@@ -108,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'
@@ -119,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'
@@ -126,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:
@@ -156,17 +156,13 @@
 
     functionality:
       - upstream-stateful:
-          schedule: ''
           sg-mode: 'stateful'
       - upstream-stateful-snat-conntrack:
-          schedule: ''
           sg-mode: 'stateful'
           odl-snat-mode: 'conntrack'
       - gate-stateful:
-          schedule: ''
           sg-mode: 'stateful'
       - gate-stateful-snat-conntrack:
-          schedule: ''
           sg-mode: 'stateful'
           odl-snat-mode: 'conntrack'
 
@@ -174,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'
@@ -186,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:
@@ -216,33 +212,24 @@
 
     functionality:
       - upstream-transparent:
-          schedule: ''
           sg-mode: 'transparent'
       - upstream-stateful:
-          schedule: ''
           sg-mode: 'stateful'
       - upstream-stateful-snat-conntrack:
-          schedule: ''
           sg-mode: 'stateful'
           odl-snat-mode: 'conntrack'
       - upstream-learn:
-          schedule: ''
           sg-mode: 'learn'
       - gate-learn:
-          schedule: ''
           sg-mode: 'learn'
       - gate-transparent:
-          schedule: ''
           sg-mode: 'transparent'
       - gate-stateful:
-          schedule: ''
           sg-mode: 'stateful'
       - gate-minimal-transparent:
-          schedule: ''
           sg-mode: 'transparent'
           testplan: '{project}-{topology}-minimal-openstack.txt'
       - gate-tempest-transparent:
-          schedule: ''
           sg-mode: 'transparent'
           testplan: '{project}-{topology}-tempest-openstack.txt'
 
@@ -261,7 +248,7 @@
     security-group-mode: '{sg-mode}'
 
 - project:
-    name: netvirt-csit-extensions-site-openstack-integration
+    name: netvirt-csit-sfc-openstack-integration
     jobs:
       - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
 
@@ -275,26 +262,31 @@
           install-features: 'odl-netvirt-sfc'
 
     functionality:
-      - extensions-sfc:
-          schedule: ''
+      - 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'
 
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
           karaf-version: karaf3
 
     openstack:
-      - newton-nodl-v2:
-          openstack-branch: 'stable/newton'
-          odl-ml2-branch: 'stable/newton'
-          odl-ml2-driver-version: 'v2'
+      - 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: 'CentOS 7 - devstack-newton - 20170808-0528'
-    openstack_system2_image: 'CentOS 7 - devstack-newton - 20170808-0528'
     security-group-mode: 'stateful'