Merge pull request #10 from redhat-performance/packaging_update

Adds a call to the package_tool utility, so the wrapper installs the required packages.

Author: dvalinrh

numa_streams/numa_streams.json

@@ -0,0 +1,58 @@
+{
+    "dependencies": {
+        "amzn": [
+            "git",
+            "gcc",
+            "bc",
+            "zip",
+            "unzip",
+            "numactl",
+            "wget",
+            "gcc-c++",
+            "autoconf",
+            "hwloc",
+            "hwloc-gui",
+            "libomp"
+        ],
+        "rhel": [
+            "git",
+            "gcc",
+            "bc",
+            "perf",
+            "zip",
+            "unzip",
+            "numactl",
+            "wget",
+            "gcc-c++",
+            "autoconf",
+            "hwloc",
+            "hwloc-gui",
+            "libomp"
+        ],
+        "sles": [
+            "git",
+            "gcc",
+            "make",
+            "bc",
+            "perf",
+            "unzip",
+            "zip",
+            "libnuma1",
+            "numactl"
+        ],
+        "ubuntu": [
+            "git",
+            "bc",
+            "zip",
+            "unzip",
+            "numactl",
+            "libnuma-dev",
+            "g++",
+            "autoconf",
+            "hwloc",
+            "libomp5-20"
+        ],
+        "pip": [
+        ]
+    }
+}

numa_streams/numa_streams_extra/run_numa_stream

@@ -206,7 +206,6 @@ setup_sizing()
 
 install_numa_streams()
 {
-	dnf install wget gcc gcc-c++ autoconf hwloc hwloc-gui libomp  -y
 	git clone https://github.com/jemalloc/jemalloc.git
 	pushd jemalloc > /dev/null
 	./autogen.sh

numa_streams/numa_streams_run

@@ -367,6 +367,12 @@ if [ ! -f "/tmp/${test_name}.out" ]; then
 	exit $?
 fi
 
+${TOOLS_BIN}/package_tool --wrapper_config ${run_dir}/numa_streams.json --no_packages $to_no_pkg_install
+if [[ $? -ne 0 ]]; then
+	echo Error: Package installation using ${TOOLS_BIN}/package_tool was unsuccessful.
+	exit 1
+fi
+
 #
 # Define user options
 #