DAOS-18601 common: fix libpmemobj-devel rpm name

The proper name for libpmemobj devel RPM on Leap/Ubuntu is
libpmemobj-devel.

Update dependency to PMDK version 2.1.2-1 as it is the latest,
stable version used for master validation.
Pin dependency to avoid accidental changes.

Remove in CI the default libpmemobj1 on Leap to instal the custom
version of this library.

Skip-func-test-leap15: false

Signed-off-by: Tomasz Gromadzki <tomasz.gromadzki@hpe.com>

Author: grom72

ci/provisioning/post_provision_config_common_functions.sh

@@ -323,7 +323,7 @@ post_provision_config_nodes() {
         rm -f "$REPOS_DIR"/*_job_daos-stack_job_*_job_*.repo
         time dnf -y erase fio fuse ior-hpc mpich-autoload          \
                      argobots cart daos daos-client daos-spdk dpdk \
-                     libisa-l libpmemobj mercury mpich   \
+                     libisa-l libpmemobj libpmemobj1 mercury mpich \
                      pmix protobuf-c spdk libfabric libpmem        \
                      munge-libs munge slurm                        \
                      slurm-example-configs slurmctld slurm-slurmmd

utils/rpms/daos.spec

@@ -61,7 +61,8 @@ BuildRequires: libjson-c-devel
 BuildRequires: boost-devel
 %endif
 %if %{with server}
-BuildRequires: libpmemobj-devel >= 2.1.0
+BuildRequires: libpmemobj-devel >= 2.1.2-1
+BuildRequires: libpmemobj-devel < 2.1.2-2
 %endif
 BuildRequires: fused-devel
 %if (0%{?suse_version} >= 1500)
@@ -164,10 +165,12 @@ Requires: ndctl
 # needed to set PMem configuration goals in BIOS through control-plane
 %if (0%{?suse_version} >= 1500)
 Requires: ipmctl >= 03.00.00.0423
-Requires: libpmemobj1 >= 2.1.0-1.suse1500
+Requires: libpmemobj1 >= 2.1.2-1
+Requires: libpmemobj1 < 2.1.2-1
 %else
 Requires: ipmctl >= 03.00.00.0468
-Requires: libpmemobj >= 2.1.0-1%{?dist}
+Requires: libpmemobj1 >= 2.1.2-1
+Requires: libpmemobj1 < 2.1.2-2
 %endif
 Requires: mercury >= %{mercury_version}
 Requires(post): /sbin/ldconfig

utils/rpms/package_info.sh

@@ -104,9 +104,9 @@ set_lib_name mercury_libfabric lib mercury-libfabric mercury-libfabric mercury-l
 export mercury_libfabric_lib
 
 set_lib_name pmemobj lib libpmemobj libpmemobj1 libpmemobj1
-set_lib_name pmemobj dev libpmemobj libpmemobj1 libpmemobj1
+set_lib_name pmemobj dev libpmemobj libpmemobj libpmemobj
 set_lib_name pmem lib libpmem libpmem1 libpmem1
-set_lib_name pmem dev libpmem libpmem libpmem1
+set_lib_name pmem dev libpmem libpmem libpmem
 set_lib_name pmempool lib libpmempool libpmempool1 libpmempool1
 export pmem_lib
 export pmem_dev