Netperf: download netperf package from generic/deps/ dir

instead of website Signed-off-by: Wenli Quan <[email protected]>
autotest · Dec 5, 2017 · 11975c3 · 11975c3
1 parent b3517f1
commit 11975c3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/generic/deps/performance/netperf-2.6.0.tar.bz2 b/generic/deps/performance/netperf-2.6.0.tar.bz2
diff --git a/generic/tests/cfg/netperf.cfg b/generic/tests/cfg/netperf.cfg
@@ -55,8 +55,7 @@
     #Test base env configration
     ver_cmd = rpm -q qemu-kvm
     netperf_version = 2.6.0
-    netperf_download_link = ftp://ftp.netperf.org/netperf/archive/netperf-2.6.0.tar.bz2
-    pkg_md5sum = 9654ffdfd4c4f2c93ce3733cd9ed9236
+    netperf_pkg = performance/netperf-2.6.0.tar.bz2
     setup_cmd = "cd /tmp && rm -rf netperf-2.6.0 && tar xvfj netperf-2.6.0.tar.bz2 && cd netperf-2.6.0 && ./configure --enable-burst --enable-demo=yes && make"
     ppc64:
         setup_cmd = "cd /tmp && rm -rf netperf-2.6.0 && tar xvfj netperf-2.6.0.tar.bz2 && cd netperf-2.6.0 && ./configure --build=ppc64 --enable-burst --enable-demo=yes  && make"

diff --git a/generic/tests/netperf.py b/generic/tests/netperf.py
@@ -95,10 +95,8 @@ def env_setup(session, ip, user, port, password):
         ssh_cmd(session, "echo 1 > /proc/sys/net/ipv4/conf/all/arp_ignore")
         ssh_cmd(session, "echo 0 > /sys/kernel/mm/ksm/run", ignore_status=True)
 
-        download_link = params.get("netperf_download_link")
-        download_dir = data_dir.get_tmp_dir()
-        md5sum = params.get("pkg_md5sum")
-        pkg = utils.unmap_url_cache(download_dir, download_link, md5sum)
+        pkg = params["netperf_pkg"]
+        pkg = os.path.join(data_dir.get_deps_dir(), pkg)
         remote.scp_to_remote(ip, shell_port, username, password, pkg, "/tmp")
         ssh_cmd(session, params.get("setup_cmd"))