summaryrefslogtreecommitdiffstats
path: root/build/f_isoroot
diff options
context:
space:
mode:
authorJonas Bjurel <jonas.bjurel@ericsson.com>2016-06-14 18:27:33 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-06-14 18:27:33 +0000
commit53ddd94cc6a61c4121300b529209662755f36b5a (patch)
treeb40d73f029e3665bbff62cab148d4745f01c6bb8 /build/f_isoroot
parenteb299372fbb32f93cac6c92060e37bd21c7d8ba0 (diff)
parent06bb603c88f8e3eb39d3539e3b73811d4bb0e435 (diff)
Merge "Enable vsperf plugin in fuel 9.0"
Diffstat (limited to 'build/f_isoroot')
-rw-r--r--build/f_isoroot/Makefile2
-rw-r--r--build/f_isoroot/f_vsperfpluginbuild/config.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile
index 17ebef3fb..862c2dbb8 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 Mitaka uplift. Please re-enable your plugin as you have
# verified it!
-PLUGINS = f_odlpluginbuild
+PLUGINS = f_odlpluginbuild f_vsperfpluginbuild
#PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_ovsnfv-dpdk-pluginbuild f_vsperfpluginbuild f_qemupluginbuild f_ovs-nsh-dpdk-pluginbuild f_bgpvpn-pluginbuild
export PLUGINS
#NON_8-0_REBASED_PLUGINS = f_bgpvpn-pluginbuild
diff --git a/build/f_isoroot/f_vsperfpluginbuild/config.mk b/build/f_isoroot/f_vsperfpluginbuild/config.mk
index 59cefd971..1bf1ef0b5 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=stable/brahmaputra
+VSPERF_BRANCH=5e3b6ae0427963520357453728411327ac8efafe
VSPERF_REPO=https://gerrit.opnfv.org/gerrit/vswitchperf.git
VSPERF_CHANGE=