From 43b8dbf7e490662f506dcf2f50fbc03bb602f26f Mon Sep 17 00:00:00 2001
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Tue, 28 Jun 2016 19:13:48 +0200
Subject: [PATCH] submodule: yardstick.
Fuel@OPNFV just added the Yardstick plugin.
This plugin is a little different, instead of breaking fuel plugin
code apart from the contents (i.e. fuel-plugin-yardstick separate
from yardstick itself), it holds both fuel plugin metadata and
actual yardstick code in the same repo.
So far, yardstick plugin code itself is arch-independant and should
not be touched.
TODO:
- add yardstick patches for arm64 until we can validate Yardstick;
- submit patches added locally in Armband to upstream
(Yardstick@OPNFV);
Change-Id: I24bc8858b92c9bdd529a64de833d7b98c06a6ade
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
.gitmodules | 4 ++++
Makefile | 3 +++
...ardstick-plugin-Allow-overriding-git-info.patch | 22 ++++++++++++++++++++++
upstream/yardstick | 1 +
4 files changed, 30 insertions(+)
create mode 100644 patches/opnfv-fuel/0012-yardstick-plugin-Allow-overriding-git-info.patch
create mode 160000 upstream/yardstick
diff --git a/.gitmodules b/.gitmodules
index 85b4d3f2..af8593d5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -34,3 +34,7 @@
path = upstream/vswitchperf
url = https://gerrit.opnfv.org/gerrit/vswitchperf.git
branch = master
+[submodule "yardstick"]
+ path = upstream/yardstick
+ url = https://gerrit.opnfv.org/gerrit/yardstick.git
+ branch = master
diff --git a/Makefile b/Makefile
index 45c059ad..e01517d3 100644
--- a/Makefile
+++ b/Makefile
@@ -82,6 +82,9 @@ build:
VSPERF_REPO=${root}/upstream/vswitchperf \
VSPERF_BRANCH=armband-workbench \
VSPERF_CHANGE= \
+ YARDSTICK_REPO=${root}/upstream/yardstick \
+ YARDSTICK_BRANCH=armband-workbench \
+ YARDSTICK_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/0012-yardstick-plugin-Allow-overriding-git-info.patch b/patches/opnfv-fuel/0012-yardstick-plugin-Allow-overriding-git-info.patch
new file mode 100644
index 00000000..79825128
--- /dev/null
+++ b/patches/opnfv-fuel/0012-yardstick-plugin-Allow-overriding-git-info.patch
@@ -0,0 +1,22 @@
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Tue, 28 Jun 2016 19:06:57 +0200
+Subject: [PATCH] yardstick plugin: Allow overriding git info.
+
+---
+ build/f_isoroot/f_yardstick-pluginbuild/config.mk | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/build/f_isoroot/f_yardstick-pluginbuild/config.mk b/build/f_isoroot/f_yardstick-pluginbuild/config.mk
+index 36df8f1..f671aa9 100644
+--- a/build/f_isoroot/f_yardstick-pluginbuild/config.mk
++++ b/build/f_isoroot/f_yardstick-pluginbuild/config.mk
+@@ -8,6 +8,6 @@
+ # http://www.apache.org/licenses/LICENSE-2.0
+ ##############################################################################
+
+-YARDSTICK_BRANCH=675eef731a098f83aa98c2021b151b7e5ba1da7d
+-YARDSTICK_REPO=https://gerrit.opnfv.org/gerrit/yardstick.git
+-YARDSTICK_CHANGE=
++YARDSTICK_BRANCH?=675eef731a098f83aa98c2021b151b7e5ba1da7d
++YARDSTICK_REPO?=https://gerrit.opnfv.org/gerrit/yardstick.git
++YARDSTICK_CHANGE?=
diff --git a/upstream/yardstick b/upstream/yardstick
new file mode 160000
index 00000000..8a4f8df6
--- /dev/null
+++ b/upstream/yardstick
@@ -0,0 +1 @@
+Subproject commit 8a4f8df64b8897bf38e77399099099f92266048b
--
2.16.6