From: gvrangan <venkatrangang@hcl.com>
Date: Fri, 10 Aug 2018 12:39:19 +0000 (+0000)
Subject: Fix Netvirt SFC CSIT Job
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=eb0d7c64c63f0b87ff446a7cca867618871a8be4;p=releng%2Fbuilder.git

Fix Netvirt SFC CSIT Job

 Problem:
  Job was deploying networkiong-sfc from "Master"
  Master included this recently merged patch
  https://review.openstack.org/#/c/569843/
  causing failures in handling openstack sfc comamnds.

 Fix:
 Patch sets networking-sfc to use the corresponding branch.

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

diff --git a/jjb/integration/integration-deploy-openstack-run-test.sh b/jjb/integration/integration-deploy-openstack-run-test.sh
index ab62ce905..accea4a0b 100644
--- a/jjb/integration/integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/integration-deploy-openstack-run-test.sh
@@ -265,7 +265,7 @@ EOF
             ENABLE_PLUGIN_ARGS="${DEVSTACK_LBAAS_PLUGIN_REPO} ${OPENSTACK_BRANCH}"
             IS_LBAAS_PLUGIN_ENABLED="yes"
         elif [ "$plugin_name" == "networking-sfc" ]; then
-            ENABLE_PLUGIN_ARGS="${DEVSTACK_NETWORKING_SFC_PLUGIN_REPO} master"
+            ENABLE_PLUGIN_ARGS="${DEVSTACK_NETWORKING_SFC_PLUGIN_REPO} ${OPENSTACK_BRANCH}"
             IS_SFC_PLUGIN_ENABLED="yes"
         else
             echo "Error: Invalid plugin $plugin_name, unsupported"