diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-06-28 23:10:10 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-06-29 14:21:57 +0200 |
| commit | 17f2551111b27ba37bd79a9a233958e188da033f (patch) | |
| tree | 16b8195d6226d8bcac76f933d8839ba3932e40ef /patches/vswitchperf/0001-ci-build-vsperf-make-qemu-system-name-arch-indep.patch | |
| parent | 28e3bc0a2c75366e1a15f17bdd24e7368d5858de (diff) | |
vswitchperf: Arch-indep build.
FIXME: dpdk, ovs, qemu etc. building only supports x86 for now.
TODO: conf dir should be patched too.
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/vswitchperf/0001-ci-build-vsperf-make-qemu-system-name-arch-indep.patch')
| -rw-r--r-- | patches/vswitchperf/0001-ci-build-vsperf-make-qemu-system-name-arch-indep.patch | 34 |
1 files changed, 34 insertions, 0 deletions
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 + |