From: Trevor Tao <trevor.tao@arm.com>
Date: Mon, 25 Sep 2017 04:15:16 +0000 (+0800)
Subject: [PATCH] Patch for Yardstick arm64 netperf_install.bash
X-Git-Tag: opnfv-6.0.0~419^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=4fb16bffb8c89c30570d13ac2d31776a5b302ef9;p=yardstick.git

[PATCH] Patch for Yardstick arm64 netperf_install.bash

Change-Id: Ic384c4603e7482f150fd4c4d2d6a6448a45ddb9e
Signed-off-by: Trevor Tao <trevor.tao@arm.com>
---

diff --git a/yardstick/benchmark/scenarios/networking/netperf_install_arm64.patch b/yardstick/benchmark/scenarios/networking/netperf_install_arm64.patch
new file mode 100644
index 000000000..b41c1d207
--- /dev/null
+++ b/yardstick/benchmark/scenarios/networking/netperf_install_arm64.patch
@@ -0,0 +1,42 @@
+diff --git a/yardstick/benchmark/scenarios/networking/netperf_install.bash b/yardstick/benchmark/scenarios/networking/netperf_install.bash
+index 0e3808f..f9362eb 100755
+--- a/yardstick/benchmark/scenarios/networking/netperf_install.bash
++++ b/yardstick/benchmark/scenarios/networking/netperf_install.bash
+@@ -1,9 +1,9 @@
+ #!/bin/bash
+
+ ##############################################################################
+-# Copyright (c) 2016 Huawei Technologies Co.,Ltd and others.
++# Copyright (c) 2017, Arm Limited. All rights reserved.
+ #
+-# All rights reserved. This program and the accompanying materials
++# This program and the accompanying materials
+ # are made available under the terms of the Apache License, Version 2.0
+ # which accompanies this distribution, and is available at
+ # http://www.apache.org/licenses/LICENSE-2.0
+@@ -19,21 +19,11 @@ then
+ fi
+
+ echo "===Install netperf before test begin!!!==="
+-cp /etc/apt/sources.list /etc/apt/sources.list_bkp
+-cp /etc/resolv.conf /etc/resolv.conf_bkp
+-echo "nameserver 8.8.4.4" >> /etc/resolv.conf
+-
+-cat <<EOF >/etc/apt/sources.list
+-deb http://archive.ubuntu.com/ubuntu/ trusty main restricted universe multiverse
+-deb http://archive.ubuntu.com/ubuntu/ trusty-security main restricted universe multiverse
+-deb http://archive.ubuntu.com/ubuntu/ trusty-updates main restricted universe multiverse
+-deb http://archive.ubuntu.com/ubuntu/ trusty-proposed main restricted universe multiverse
+-deb http://archive.ubuntu.com/ubuntu/ trusty-backports main restricted universe multiverse
+-EOF
+-
+-sudo apt-get update
+-sudo apt-get install -y netperf
+
++apt-get update -y
++apt-get install -y wget
++wget http://launchpadlibrarian.net/155043952/netperf_2.6.0-2_arm64.deb
++dpkg -i ./netperf_2.6.0-2_arm64.deb
+ service netperf start
+
+ echo "===Install netperf before test end!!!==="