Skip to content

Commit 4b071ba

Browse files
authored
Merge pull request #38 from redhat-performance/dep-update
Start using new package management system
2 parents 2d966eb + ae52811 commit 4b071ba

2 files changed

Lines changed: 42 additions & 1 deletion

File tree

passmark.json

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{
2+
"dependencies": {
3+
"rhel": [
4+
"bc",
5+
"numactl",
6+
"perf",
7+
"git",
8+
"zip",
9+
"unzip"
10+
],
11+
"ubuntu": [
12+
"bc",
13+
"numactl",
14+
"git",
15+
"zip",
16+
"unzip",
17+
"libncurses5"
18+
],
19+
"amzn": [
20+
"bc",
21+
"numactl",
22+
"perf",
23+
"git",
24+
"zip",
25+
"unzip"
26+
],
27+
"sles": [
28+
"bc",
29+
"libnuma1",
30+
"perf",
31+
"git",
32+
"zip",
33+
"unzip",
34+
"libncurses5"
35+
]
36+
}
37+
}

passmark/passmark_run

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
test_name="passmark"
2525
passmark_version="v1.0"
2626
curdir=`pwd`
27+
script_dir=$(dirname $(realpath $0))
2728
copy_dirs=""
2829

2930
if [ ! -f "/tmp/${test_name}.out" ]; then
@@ -364,8 +365,11 @@ done
364365
os=`$TOOLS_BIN/detect_os`
365366
if [[ $os == "ubuntu" ]]; then
366367
add-apt-repository universe -y
367-
apt-get install libncurses5 -y
368+
elif [[ $os == "sles" ]]; then
369+
SUSEConnect --product sle-module-legacy/$($TOOLS_BIN/detect_os --os-version)/$(arch)
368370
fi
369371

372+
$TOOLS_BIN/package_tool --no_packages $to_no_pkg_install --wrapper_config $script_dir/../passmark.json
373+
370374
run_passmark
371375
exit 0

0 commit comments

Comments
 (0)