From 4e3241b79e1dd3266d376bb29a781eea36738443 Mon Sep 17 00:00:00 2001 From: gvrangan Date: Mon, 24 Sep 2018 22:41:47 +0530 Subject: [PATCH] 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 --- jjb/netvirt/netvirt-csit-multi-openstack.yaml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml index 2ec08126c..389154284 100644 --- 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 -- 2.36.6