Add oxygen+ocata combo till pike is good

Change-Id: I79edf65ac793f83586ceffd4c2c107e35951008f
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index 087fa07ca0cb9e54e76ef2c4c97916cea27b9862..08ec33df1a6b5f7dc1ab5d1938613f4ede2ed59f 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -44,20 +44,28 @@
           testplan: '{project}-{topology}-minimal-openstack.txt'
 
     openstack:
+      - 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'
       - 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'
           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'
     security-group-mode: '{sg-mode}'
 
 - project: