Merge "Linpack changes the download URL"

cloud-bulldozer · Nov 29, 2017 · baae24a · baae24a
2 parents 277111d + 5cdad56
commit baae24a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/ansible/install/group_vars/all.yml b/ansible/install/group_vars/all.yml
@@ -65,6 +65,10 @@ browbeat_network:
 # For Pbench Repos - Provide the internal RPM URL
 pbench_internal_url:
 
+# linpack url
+linpack_url: http://registrationcenter-download.intel.com/akdlm/irc_nas/9752/l_mklb_p_2018.0.006.tgz
+linpack_path: /benchmarks_2018/linux/mkl/benchmarks/linpack/
+
 # Browbeat Rally workloads
 browbeat_workloads:
   linpack:

diff --git a/ansible/install/roles/workloads/templates/linpack-user.file b/ansible/install/roles/workloads/templates/linpack-user.file
@@ -4,10 +4,10 @@ if [ $? -gt 0 ]
 then
   exit 1
 fi
-sudo curl -O http://registrationcenter-download.intel.com/akdlm/irc_nas/9752/l_mklb_p_2017.3.018.tgz
-sudo tar -xvzf l_mklb_p_2017.3.018.tgz
+sudo curl -O {{ linpack_url }}
+sudo tar -xvzf {{ linpack_url | basename }}
 sudo mkdir /opt/linpack
-sudo cp l_mklb_p_2017.3.018/benchmarks_2017/linux/mkl/benchmarks/linpack/* /opt/linpack
+sudo cp {{ linpack_url | basename | replace(".tgz", "") }}{{ linpack_path}}* /opt/linpack
 if [ $? -gt 0 ]
 then
   exit 1