patches/vswitchperf/0001-ci-build-vsperf-make-qemu-system-name-arch-indep.patch

   1 From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
   2 Date: Tue, 28 Jun 2016 21:27:02 +0200
   3 Subject: [PATCH] ci/build-vsperf: make qemu-system name arch-indep.
   4
   5 Instead of hardcoding x86_64 into qemu-system name, use `uname -m`.
   6
   7 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
   8 ---
   9  ci/build-vsperf.sh | 7 ++++---
  10  1 file changed, 4 insertions(+), 3 deletions(-)
  11
  12 diff --git a/ci/build-vsperf.sh b/ci/build-vsperf.sh
  13 index 5370898..fc38747 100755
  14 --- a/ci/build-vsperf.sh
  15 +++ b/ci/build-vsperf.sh
  16 @@ -87,14 +87,15 @@ TEST_REPORT_LOG_DIR="${HOME}/opnfv/$PROJECT/results/$BRANCH"
  17  # parameters:
  18  #   none
  19  function terminate_vsperf() {
  20 +    local qemu_system_name="qemu-system-$(uname -m)"
  21      sudo pkill stress &> /dev/null
  22      sudo pkill python3 &> /dev/null
  23 -    sudo killall -9 qemu-system-x86_64 &> /dev/null
  24 +    sudo killall -9 "${qemu_system_name}" &> /dev/null
  25
  26      # sometimes qemu resists to terminate, so wait a bit and kill it again
  27 -    if pgrep qemu-system-x86_64 &> /dev/null ; then
  28 +    if pgrep "${qemu_system_name}" &> /dev/null ; then
  29          sleep 5
  30 -        sudo killall -9 qemu-system-x86_64 &> /dev/null
  31 +        sudo killall -9 "${qemu_system_name}" &> /dev/null
  32          sleep 5
  33      fi
  34