diff options
| -rw-r--r-- | .gitmodules | 8 | ||||
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | patches/opnfv-fuel/0012-yardstick-plugin-Allow-overriding-git-info.patch | 22 | ||||
| -rw-r--r-- | patches/opnfv-fuel/0014-vsperf-plugin-Allow-overriding-git-info.patch | 23 | ||||
| -rw-r--r-- | patches/vswitchperf/0001-ci-build-vsperf-make-qemu-system-name-arch-indep.patch | 34 | ||||
| -rw-r--r-- | patches/vswitchperf/0002-s-u-build_base_machine-Arch-indep-libdir-s.patch | 30 | ||||
| m--------- | upstream/vswitchperf | 0 | ||||
| m--------- | upstream/yardstick | 0 |
8 files changed, 123 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index 3069a650..af8593d5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -30,3 +30,11 @@ 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 +[submodule "yardstick"] + path = upstream/yardstick + url = https://gerrit.opnfv.org/gerrit/yardstick.git + branch = master @@ -79,6 +79,12 @@ 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= \ + 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/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/patches/vswitchperf/0001-ci-build-vsperf-make-qemu-system-name-arch-indep.patch b/patches/vswitchperf/0001-ci-build-vsperf-make-qemu-system-name-arch-indep.patch new file mode 100644 index 00000000..29e8a1d3 --- /dev/null +++ b/patches/vswitchperf/0001-ci-build-vsperf-make-qemu-system-name-arch-indep.patch @@ -0,0 +1,34 @@ +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +Date: Tue, 28 Jun 2016 21:27:02 +0200 +Subject: [PATCH] ci/build-vsperf: make qemu-system name arch-indep. + +Instead of hardcoding x86_64 into qemu-system name, use `uname -m`. + +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +--- + ci/build-vsperf.sh | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/ci/build-vsperf.sh b/ci/build-vsperf.sh +index 5370898..fc38747 100755 +--- a/ci/build-vsperf.sh ++++ b/ci/build-vsperf.sh +@@ -87,14 +87,15 @@ TEST_REPORT_LOG_DIR="${HOME}/opnfv/$PROJECT/results/$BRANCH" + # parameters: + # none + function terminate_vsperf() { ++ local qemu_system_name="qemu-system-$(uname -m)" + sudo pkill stress &> /dev/null + sudo pkill python3 &> /dev/null +- sudo killall -9 qemu-system-x86_64 &> /dev/null ++ sudo killall -9 "${qemu_system_name}" &> /dev/null + + # sometimes qemu resists to terminate, so wait a bit and kill it again +- if pgrep qemu-system-x86_64 &> /dev/null ; then ++ if pgrep "${qemu_system_name}" &> /dev/null ; then + sleep 5 +- sudo killall -9 qemu-system-x86_64 &> /dev/null ++ sudo killall -9 "${qemu_system_name}" &> /dev/null + sleep 5 + fi + diff --git a/patches/vswitchperf/0002-s-u-build_base_machine-Arch-indep-libdir-s.patch b/patches/vswitchperf/0002-s-u-build_base_machine-Arch-indep-libdir-s.patch new file mode 100644 index 00000000..0a92144f --- /dev/null +++ b/patches/vswitchperf/0002-s-u-build_base_machine-Arch-indep-libdir-s.patch @@ -0,0 +1,30 @@ +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +Date: Tue, 28 Jun 2016 21:35:44 +0200 +Subject: [PATCH] s/u/build_base_machine: Arch indep libdir(s). + +The same fixes should be applied on arm64, for example. + +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +--- + systems/ubuntu/build_base_machine.sh | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/systems/ubuntu/build_base_machine.sh b/systems/ubuntu/build_base_machine.sh +index a2b48a2..7cbe78e 100755 +--- a/systems/ubuntu/build_base_machine.sh ++++ b/systems/ubuntu/build_base_machine.sh +@@ -52,11 +52,12 @@ apt-get -y install libfuse-dev + # packages related to VM + + # a few manual fix up on a ubuntu +-cd /lib/x86_64-linux-gnu ++local arch=$(uname -m) ++cd /lib/${arch}-linux-gnu + ln -sf libssl.so.1.0.0 libssl.so + ln -sf libcrypto.so.1.0.0 libcrypto.so + +-cd /usr/lib/x86_64-linux-gnu ++cd /usr/lib/${arch}-linux-gnu + ln -sf libxml2.so.2 libxml2.so + + diff --git a/upstream/vswitchperf b/upstream/vswitchperf new file mode 160000 +Subproject e04b1b9a22f93bb1783ff9e82486aec38dcb0ef diff --git a/upstream/yardstick b/upstream/yardstick new file mode 160000 +Subproject 8a4f8df64b8897bf38e77399099099f92266048 |