From a5748ad1e936461a5cb592e354e7b1c771c924f0 Mon Sep 17 00:00:00 2001 From: Billy O'Mahony Date: Wed, 20 Jan 2016 17:13:56 +0000 Subject: fuel-plugin-vsperf: Change repo for vswitchperf plugin Change-Id: I694039c2762f17dfa4fdb642ad34e31aa7e2362a Signed-off-by: Billy O'Mahony --- build/f_isoroot/f_vsperfpluginbuild/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'build/f_isoroot/f_vsperfpluginbuild/Makefile') 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 -- cgit 1.2.3-korg