diff options
| author |   Ross Brattain <ross.b.brattain@intel.com> | 2017-09-27 23:42:32 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-27 23:42:32 +0000 |
| commit | 1bd39dc28a422c98d95451d9893c51bf3867806c (patch) | |
| tree | 667deff8cd324913fd1695eba470253b15621f37 | |
| parent | 804a541be394f794047a55091c9378c605e9e7ec (diff) | |
| parent | 4fb16bffb8c89c30570d13ac2d31776a5b302ef9 (diff) | |
Merge "[PATCH] Patch for Yardstick arm64 netperf_install.bash"
| -rw-r--r-- | yardstick/benchmark/scenarios/networking/netperf_install_arm64.patch | 42 |
1 files changed, 42 insertions, 0 deletions
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!!!===" |