submodule: vswitchperf.

Change-Id: I986bfb5ae549321a0696f945d24ccb1b6b198f96
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

diff --git a/.gitmodules b/.gitmodules
index 3069a65..85b4d3f 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -30,3 +30,7 @@
        path = upstream/fuel-plugin-ovs
        url = https://github.com/openstack/fuel-plugin-ovs
        branch = master
+[submodule "vswitchperf"]
+       path = upstream/vswitchperf
+       url = https://gerrit.opnfv.org/gerrit/vswitchperf.git
+       branch = master

diff --git a/Makefile b/Makefile
index 19a690d..45c059a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -79,6 +79,9 @@ build:
                        FUEL_NAILGUN_AGENT_COMMIT=HEAD \
                        FUEL_MIRROR_COMMIT=HEAD \
                        ODL_BRANCH=armband-workbench \
+                       VSPERF_REPO=${root}/upstream/vswitchperf \
+                       VSPERF_BRANCH=armband-workbench \
+                       VSPERF_CHANGE= \
                        EXTRA_RPM_REPOS="armband,http://linux.enea.com/mos-repos/centos/mos9.0-centos7/armband/x86_64,10" \
                        MIRROR_MOS_UBUNTU=linux.enea.com \
                        JAVA8_URL=https://launchpad.net/~openjdk-r/+archive/ubuntu/ppa/+files/openjdk-8-jre-headless_8u72-b15-1~trusty1_arm64.deb \

diff --git a/patches/opnfv-fuel/0014-vsperf-plugin-Allow-overriding-git-info.patch b/patches/opnfv-fuel/0014-vsperf-plugin-Allow-overriding-git-info.patch
new file mode 100644 (file)
index 0000000..d82aa0f
--- /dev/null
+++ b/patches/opnfv-fuel/0014-vsperf-plugin-Allow-overriding-git-info.patch
@@ -0,0 +1,23 @@
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Tue, 28 Jun 2016 20:42:58 +0200
+Subject: [PATCH] vsperf plugin: Allow overriding git info.
+
+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+---
+ build/f_isoroot/f_vsperfpluginbuild/config.mk | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/build/f_isoroot/f_vsperfpluginbuild/config.mk b/build/f_isoroot/f_vsperfpluginbuild/config.mk
+index 1bf1ef0..576018d 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=5e3b6ae0427963520357453728411327ac8efafe
+-VSPERF_REPO=https://gerrit.opnfv.org/gerrit/vswitchperf.git
+-VSPERF_CHANGE=
++VSPERF_BRANCH?=5e3b6ae0427963520357453728411327ac8efafe
++VSPERF_REPO?=https://gerrit.opnfv.org/gerrit/vswitchperf.git
++VSPERF_CHANGE?=

diff --git a/upstream/vswitchperf b/upstream/vswitchperf
new file mode 160000 (submodule)
index 0000000..e04b1b9
--- /dev/null
+++ b/upstream/vswitchperf
@@ -0,0 +1 @@
+Subproject commit e04b1b9a22f93bb1783ff9e82486aec38dcb0efb