aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark D. Gray <mark.d.gray@intel.com>2016-01-07 15:23:03 +0000
committerStefan Berg <stefan.k.berg@ericsson.com>2016-01-29 08:47:37 +0000
commit6c6f90b3ad763c229fe75ae2a9b3f673f84382da (patch)
treeec45a70e35476d441f30cabd9f8d1665c2ccadd9
parent0404985fca063a2a1f68ead9aad8a220f2cf5bcc (diff)
f_ovsnfv-dpdk-pluginbuild: Update repo location
The code for fuel-plugin-ovsnfv has been moved to the ovsnfv OPNFV project repository. This patch updates the OPNFV fuel plugin builder to use this location. Change-Id: Ida1640ea6005aa1f4b31be145913556d6b05aa6e Signed-off-by: Mark D. Gray <mark.d.gray@intel.com> (cherry picked from commit 42d1a8174af0f2081a9de76c798ee2b081cc0686)
-rw-r--r--build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile9
-rw-r--r--build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config.mk5
2 files changed, 8 insertions, 6 deletions
diff --git a/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile b/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile
index 6b76fbe50..70fd22409 100644
--- a/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile
+++ b/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile
@@ -37,15 +37,16 @@ release:.ovsnfvbuild
@rm -rf fuel-plugin-ovsnfv
sudo apt-get -y install build-essential ruby-dev rubygems-integration python-pip git rpm createrepo dpkg-dev
sudo pip install fuel-plugin-builder
- git clone $(OVSNFV_DPDK_REPO)
- cd fuel-plugin-ovsnfv; \
+ git clone $(OVSNFV_DPDK_REPO) ovsnfv
+ cd ovsnfv; \
git checkout $(OVSNFV_DPDK_BRANCH); \
if [ ! -z $(OVSNFV_DPDK_CHANGE) ]; then \
git fetch $(OVSNFV_DPDK_REPO) $(OVSNFV_DPDK_CHANGE); \
git checkout FETCH_HEAD; \
fi
- INCLUDE_DEPENDENCIES=true fpb --debug --build fuel-plugin-ovsnfv/
- @mv fuel-plugin-ovsnfv/fuel-plugin-ovsnfv*.rpm .
+ cd ovsnfv; \
+ INCLUDE_DEPENDENCIES=true fpb --debug --build $(OVSNFV_DPDK_DIR)
+ @mv ovsnfv/$(OVSNFV_DPDK_DIR)/fuel-plugin-ovsnfv*.rpm .
$(REPOINFO) -r . > gitinfo_ovsnfv-dpdk-plugin.txt
@rm -rf fuel-plugin-ovsnfv
@touch .ovsnfvbuild
diff --git a/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config.mk b/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config.mk
index cfaa4f723..1893fce4a 100644
--- a/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config.mk
+++ b/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config.mk
@@ -7,6 +7,7 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-OVSNFV_DPDK_BRANCH=d13417a93c4df1d4db8f86f23ae4d42a056b5de8
-OVSNFV_DPDK_REPO=https://github.com/mrmarkgray/fuel-plugin-ovsnfv
+OVSNFV_DPDK_BRANCH=stable/brahmaputra
+OVSNFV_DPDK_REPO=https://gerrit.opnfv.org/gerrit/p/ovsnfv.git
+OVSNFV_DPDK_DIR=fuel-plugin-ovsnfv
OVSNFV_DPDK_CHANGE=