summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-06-29 13:34:53 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-06-29 13:34:53 +0000
commit79fb87511fcca5e8c7477e1572e30ffa080c7de3 (patch)
tree28d26999a7b90428637e844e168a99982abc5d98
parent547405524ccb611d0b11d2d7f599ddbcf7cbf728 (diff)
parent28e3bc0a2c75366e1a15f17bdd24e7368d5858de (diff)
Merge "submodule: vswitchperf."
-rw-r--r--.gitmodules4
-rw-r--r--Makefile3
-rw-r--r--patches/opnfv-fuel/0014-vsperf-plugin-Allow-overriding-git-info.patch23
m---------upstream/vswitchperf0
4 files changed, 30 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index 3069a650..85b4d3f2 100644
--- 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 19a690d2..45c059ad 100644
--- 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
index 00000000..d82aa0f8
--- /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
+Subproject e04b1b9a22f93bb1783ff9e82486aec38dcb0ef