Skip to content

Commit 40630b6

Browse files
committed
helpers: add support for SL16.0
Signed-off-by: Nicolas Morey <nmorey@suse.com>
1 parent fff15a9 commit 40630b6

File tree

5 files changed

+44
-17
lines changed

5 files changed

+44
-17
lines changed

helpers/common/00-cleanup

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,33 +57,37 @@ get_common_package_list()
5757
local host=$1
5858
PACKAGE_LIST="infiniband-diags rdma-ndd libibverbs-utils srp_daemon fabtests "
5959
PACKAGE_LIST+=" mpitests-mvapich2"
60-
PACKAGE_LIST+=" ibutils dapl-utils psmisc nfs-kernel-server"
60+
PACKAGE_LIST+=" ibutils psmisc nfs-kernel-server"
6161
PACKAGE_LIST+=" nvme-cli nvmetcli bc iputils"
6262

6363
case $(get_suse_version $host) in
6464
15|15.1)
65-
PACKAGE_LIST+=" python3-targetcli-fb "
65+
PACKAGE_LIST+=" python3-targetcli-fb dapl-utils "
6666
PACKAGE_LIST+=" mpitests-openmpi2 mpitests-mpich"
6767
;;
6868
15.2|15.3)
69-
PACKAGE_LIST+=" python3-targetcli-fb "
69+
PACKAGE_LIST+=" python3-targetcli-fb dapl-utils "
7070
PACKAGE_LIST+=" mpitests-openmpi2 mpitests-mpich"
7171
PACKAGE_LIST+=" mpitests-openmpi3"
7272
;;
7373
15.4|15.5)
74-
PACKAGE_LIST+=" python3-targetcli-fb "
74+
PACKAGE_LIST+=" python3-targetcli-fb dapl-utils "
7575
PACKAGE_LIST+=" mpitests-openmpi2 mpitests-mpich"
7676
PACKAGE_LIST+=" mpitests-openmpi3 mpitests-openmpi4"
7777
;;
7878
15.6|15.7)
79-
PACKAGE_LIST+=" python3-targetcli-fb "
79+
PACKAGE_LIST+=" python3-targetcli-fb dapl-utils "
8080
PACKAGE_LIST+=" mpitests-openmpi4 mpitests-mpich"
8181
;;
82+
16.0)
83+
PACKAGE_LIST+=" targetcli-fb "
84+
PACKAGE_LIST+=" mpitests-openmpi4 mpitests-openmpi5 mpitests-mpich"
85+
;;
8286
42.3|12.3|12.4|12.5)
83-
PACKAGE_LIST+=" mpitests-openmpi targetcli-fb "
87+
PACKAGE_LIST+=" mpitests-openmpi targetcli-fb dapl-utils "
8488
;;
8589
2022*)
86-
PACKAGE_LIST+=" python3-targetcli-fb "
90+
PACKAGE_LIST+=" python3-targetcli-fb dapl-utils "
8791
PACKAGE_LIST+=" mpitests-openmpi2 mpitests-mpich"
8892
PACKAGE_LIST+=" mpitests-openmpi3 mpitests-openmpi4"
8993
;;
@@ -117,4 +121,4 @@ check_existing_sw_rdma_if()
117121
echo "No SW RDMA found as expected"
118122
fi
119123
return $n_rdma
120-
}
124+
}

helpers/common/05-nfs

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,19 @@ test_nfs()
3333
echo 'rdma 20049' > /proc/fs/nfsd/portlist &&
3434
exportfs -a &&
3535
dd if=/dev/urandom bs=1M count=64 of=/tmp/RAM/input"
36-
36+
mountpoint=""
37+
case $(get_suse_version $server) in
38+
16.0)
39+
# NFSv4
40+
mountpoint="/"
41+
;;
42+
*)
43+
mountpoint="/tmp/RAM"
44+
;;
45+
esac
3746
tp $client "modprobe xprtrdma &&
3847
mkdir -p /tmp/RAM &&
39-
mount -o rdma,port=20049 $server_ip:/tmp/RAM /tmp/RAM &&
48+
mount -o rdma,port=20049 $server_ip:$mountpoint /tmp/RAM &&
4049
(cat /proc/mounts | grep /tmp/RAM | grep proto=rdma) &&
4150
sleep 1 &&
4251
dd if=/tmp/RAM/input bs=1M count=1024 of=/tmp/RAM/output &&

helpers/common/08-mpi

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@ openmpi3--btl=ofi--pml=^ucx,\
2222
openmpi3--btl=self--pml=ucx,\
2323
openmpi4,\
2424
openmpi4--btl=ofi--pml=^ucx,\
25-
openmpi4--btl=self--pml=ucx"
25+
openmpi4--btl=self--pml=ucx,\
26+
openmpi5,\
27+
openmpi5--btl=ofi--pml=cm,\
28+
openmpi5--btl=uct--pml=ucx"
2629

2730
export MPI_FLAVOURS=${MPI_FLAVOURS:-$DEFAULT_MPI_FLAVOURS}
2831

@@ -45,7 +48,7 @@ test_mpi()
4548
openmpi|openmpi2)
4649
RUN_ARGS="${RUN_ARGS} --allow-run-as-root"
4750
;;
48-
openmpi3|openmpi4)
51+
openmpi3|openmpi4|openmpi5)
4952
RUN_ARGS="${RUN_ARGS} --allow-run-as-root --oversubscribe"
5053
;;
5154
esac
@@ -76,19 +79,22 @@ mpi_get_flavors()
7679
local flavours=$2
7780
case $(get_suse_version $host) in
7881
15|15.1)
79-
flavours=$(mpi_filter_flavour $flavours openmpi openmpi3 openmpi4)
82+
flavours=$(mpi_filter_flavour $flavours openmpi openmpi3 openmpi4 openmpi5)
8083
;;
8184
15.2|15.3)
82-
flavours=$(mpi_filter_flavour $flavours openmpi openmpi4)
85+
flavours=$(mpi_filter_flavour $flavours openmpi openmpi4 openmpi5)
8386
;;
8487
15.4|15.5)
85-
flavours=$(mpi_filter_flavour $flavours openmpi)
88+
flavours=$(mpi_filter_flavour $flavours openmpi openmpi5)
8689
;;
8790
15.6|15.7)
91+
flavours=$(mpi_filter_flavour $flavours openmpi openmpi2 openmpi3 openmpi5)
92+
;;
93+
16.0)
8894
flavours=$(mpi_filter_flavour $flavours openmpi openmpi2 openmpi3)
8995
;;
9096
12.3|12.4|12.5)
91-
flavours=$(mpi_filter_flavour $flavours openmpi2 openmpi3 openmpi4 mpich)
97+
flavours=$(mpi_filter_flavour $flavours openmpi2 openmpi3 openmpi4 openmpi5 mpich)
9298
;;
9399
*)
94100
# N/A

helpers/common/09-libfabric

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ test_libfabric()
2828
15.6)
2929
skipped_tests=""
3030
;;
31-
15.7)
31+
15.7|16.0)
3232
skipped_tests="-e fi_dgram_pingpong"
3333
;;
3434
*)

helpers/ib/06-dapl

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,14 @@ test_dapl(){
2121
local ib2=$4
2222
local ip2=$5
2323

24+
case $(get_suse_version $host1) in
25+
16.0)
26+
return 0
27+
;;
28+
*)
29+
;;
30+
esac
31+
2432
local dapl_name1=$(tpq $host1 "grep '$ib1' /etc/dat.conf | head -n 1 | awk '{print \$1}'")
2533
local dapl_name2=$(tpq $host2 "grep '$ib2' /etc/dat.conf | head -n 1 | awk '{print \$1}'")
2634

0 commit comments

Comments
 (0)