From: Billy O'Mahony <billy.o.mahony@intel.com>
Date: Wed, 20 Jan 2016 17:13:56 +0000 (+0000)
Subject: fuel-plugin-vsperf: Change repo for vswitchperf plugin
X-Git-Tag: colorado.1.rc1~247
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=a5748ad1e936461a5cb592e354e7b1c771c924f0;p=fuel.git

fuel-plugin-vsperf: Change repo for vswitchperf plugin

Change-Id: I694039c2762f17dfa4fdb642ad34e31aa7e2362a
Signed-off-by: Billy O'Mahony <billy.o.mahony@intel.com>
---

diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile
index e6a4450f6..222e6147d 100644
--- a/build/f_isoroot/Makefile
+++ b/build/f_isoroot/Makefile
@@ -9,7 +9,7 @@
 ##############################################################################
 
 # Add Fuel plugin build targets here
-PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_ovsnfv-dpdk-pluginbuild
+PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_ovsnfv-dpdk-pluginbuild f_vsperfpluginbuild
 #NON_8-0_REBASED_PLUGINS = f_qemupluginbuild f_ovs-nsh-dpdk-pluginbuild f_onosfwpluginbuild f_bgpvpn-pluginbuild f_ovsnfv-dpdk-pluginbuild f_vsperfpluginbuild
 
 # If the BUILD_FUEL_PLUGINS environment variable is set, only build the plugins
diff --git a/build/f_isoroot/f_vsperfpluginbuild/Makefile b/build/f_isoroot/f_vsperfpluginbuild/Makefile
index c9653d785..f45aecb88 100644
--- a/build/f_isoroot/f_vsperfpluginbuild/Makefile
+++ b/build/f_isoroot/f_vsperfpluginbuild/Makefile
@@ -34,19 +34,20 @@ release:.vsperfbuild
 	cd $(BUILD_BASE) && mkdir -p ../deploy/templates/plugins && cp -rf $(TOP)/config/* ../deploy/templates/plugins
 
 .vsperfbuild:
-	@rm -rf fuel-plugin-vsperf
+	@rm -rf vswitchperf
 	sudo apt-get -y install build-essential ruby-dev rubygems-integration python-pip git rpm createrepo dpkg-dev
 	sudo pip install fuel-plugin-builder
 	../../docker/ubuntu-builder/install_docker.sh
-	git clone $(VSPERF_REPO)
-	cd fuel-plugin-vsperf; \
+	git clone $(VSPERF_REPO) vswitchperf
+	cd vswitchperf; \
 	git checkout $(VSPERF_BRANCH); \
 	if [ ! -z $(VSPERF_CHANGE) ]; then \
 	   git fetch $(VSPERF_REPO) $(VSPERF_CHANGE); \
 	   git checkout FETCH_HEAD; \
 	fi
+	cd vswitchperf; \
 	INCLUDE_DEPENDENCIES=true fpb --debug --build fuel-plugin-vsperf/
-	@mv fuel-plugin-vsperf/fuel-plugin-vsperf*.rpm .
+	@mv vswitchperf/fuel-plugin-vsperf/fuel-plugin-vsperf*.rpm .
 	$(REPOINFO) -r . > gitinfo_vsperf-plugin.txt
 	@rm -rf fuel-plugin-vsperf
 	@touch .vsperfbuild
diff --git a/build/f_isoroot/f_vsperfpluginbuild/config.mk b/build/f_isoroot/f_vsperfpluginbuild/config.mk
index df064680e..59cefd971 100644
--- a/build/f_isoroot/f_vsperfpluginbuild/config.mk
+++ b/build/f_isoroot/f_vsperfpluginbuild/config.mk
@@ -7,6 +7,6 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-VSPERF_BRANCH=4256eef4e237ce9409d8cbffe9237f37a315d513
-VSPERF_REPO=https://github.com/billyom/fuel-plugin-vsperf.git
+VSPERF_BRANCH=stable/brahmaputra
+VSPERF_REPO=https://gerrit.opnfv.org/gerrit/vswitchperf.git
 VSPERF_CHANGE=