Fix Netvirt SFC Oxygen Jobs

- OVS 2.6.1 does not build with latest
  kernel versions, so reverting to pike
  image for Oxygen jobs only

Change-Id: I353ad4dbe01e8324149ec5132c509a273734bcc2
Signed-off-by: gvrangan <venkatrangang@hcl.com>

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index 2ec08126c828c3c31371eaec53bc891188037102..389154284727f5cf02d1edf8a214c31ed68db28c 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -251,6 +251,14 @@
           enable-openstack-plugins: 'networking-odl,networking-sfc'
           testplan: '{project}-extensions-sfc.txt'
 
+    openstack:
+      - queens:
+          openstack-branch: 'stable/queens'
+          odl-ml2-branch: 'stable/queens'
+          odl-ml2-port-binding: 'pseudo-agentdb-binding'
+          openstack_system_image: '{openstack_system_image_queens}'
+          openstack_system2_image: '{openstack_system_image_queens}'
+
     stream:
       - neon:
           branch: 'master'
@@ -263,14 +271,8 @@
           ovs-install: 'v2.6.1-nsh'
           os-cmp-cnt: 1
           openstack_system2_count: 1
-
-    openstack:
-      - queens:
-          openstack-branch: 'stable/queens'
-          odl-ml2-branch: 'stable/queens'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_system_image_queens}'
-          openstack_system2_image: '{openstack_system_image_queens}'
+          openstack_system_image: '{openstack_system_image_pike}'
+          openstack_system2_image: '{openstack_system_image_pike}'
 
 - project:
     name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration