summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuo Ruijing <ruijing.guo@intel.com>2016-12-20 10:33:22 -0800
committerGuo Ruijing <ruijing.guo@intel.com>2016-12-20 10:34:20 -0800
commit8579b828d1cf683e5d579236e5a3b9a8849ba82c (patch)
treedcae6f1b70a90d9a5f715ba634110afb87677ca6
parent67a6f787747dd577040829b2834a440ac77f3ab0 (diff)
Enable yardstick in D release
Change-Id: Ie9efd6a01b483e3e0797c19708cd1ca793f609d6 Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
-rw-r--r--build/f_isoroot/Makefile2
-rw-r--r--build/f_isoroot/f_yardstick-pluginbuild/config.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile
index e189e1697..a011000a3 100644
--- a/build/f_isoroot/Makefile
+++ b/build/f_isoroot/Makefile
@@ -11,7 +11,7 @@
# Add Fuel plugin build targets here
# Plugins disabled for the Fuel Newton uplift. Please re-enable your plugin as you have
# verified it!
-PLUGINS = f_ovs-nsh-dpdk-pluginbuild f_vsperfpluginbuild f_kvm-pluginbuild
+PLUGINS = f_ovs-nsh-dpdk-pluginbuild f_vsperfpluginbuild f_kvm-pluginbuild f_yardstick-pluginbuild
export PLUGINS
NON_10-0_REBASED_PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_ovsnfv-dpdk-pluginbuild f_vsperfpluginbuild f_bgpvpn-pluginbuild
diff --git a/build/f_isoroot/f_yardstick-pluginbuild/config.mk b/build/f_isoroot/f_yardstick-pluginbuild/config.mk
index 88b1ea604..6cf00b74c 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?=86b9fc4f434c72bd276e4bf1ce7d7f5a04b150b2
+YARDSTICK_BRANCH?=0e23c697e6329a57ba168cc57886b436ea87cdc4
YARDSTICK_REPO?=https://gerrit.opnfv.org/gerrit/yardstick.git
YARDSTICK_CHANGE?=