From ef84be101978df41ba2566e05fe66ce2e06594d7 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Tue, 17 Feb 2026 14:18:44 +0100 Subject: [PATCH 1/3] 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 --- .../post_provision_config_common_functions.sh | 2 +- utils/rpms/daos.spec | 9 ++++++--- utils/rpms/package_info.sh | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ci/provisioning/post_provision_config_common_functions.sh b/ci/provisioning/post_provision_config_common_functions.sh index 0b3d9413ab2..5c5e2a50fbd 100755 --- a/ci/provisioning/post_provision_config_common_functions.sh +++ b/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 diff --git a/utils/rpms/daos.spec b/utils/rpms/daos.spec index b4b8af94452..37b71791220 100644 --- a/utils/rpms/daos.spec +++ b/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-2 %else Requires: ipmctl >= 03.00.00.0468 -Requires: libpmemobj >= 2.1.0-1%{?dist} +Requires: libpmemobj >= 2.1.2-1 +Requires: libpmemobj < 2.1.2-2 %endif Requires: mercury >= %{mercury_version} Requires(post): /sbin/ldconfig diff --git a/utils/rpms/package_info.sh b/utils/rpms/package_info.sh index ac6356c3c72..11427d3fcd8 100644 --- a/utils/rpms/package_info.sh +++ b/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 From 6ce440ecc61fcb367ece58eec729ea7b6290723d Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Thu, 19 Feb 2026 20:32:06 +0100 Subject: [PATCH 2/3] Bump version to trigger new library upload The new library is uploaded/released only when the library version has been changed. Signed-off-by: Tomasz Gromadzki --- utils/rpms/daos.changelog | 3 +++ utils/rpms/daos.spec | 14 +++++++------- utils/rpms/package_info.sh | 2 +- utils/rpms/pmdk.changelog | 3 +++ 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/utils/rpms/daos.changelog b/utils/rpms/daos.changelog index ac92201275b..fe473941458 100644 --- a/utils/rpms/daos.changelog +++ b/utils/rpms/daos.changelog @@ -1,4 +1,7 @@ %changelog +* Thu Feb 19 2026 Tomasz Gromadzki - 2.7.104-2 +- Update PMDK to release 2.1.2-2 - fix the name of libpmemobj-devel for leap + * Tue Feb 10 2026 Dalton Bohning 2.7.104-1 - Bump version to 2.7.104 diff --git a/utils/rpms/daos.spec b/utils/rpms/daos.spec index 37b71791220..4e7afcc6d1b 100644 --- a/utils/rpms/daos.spec +++ b/utils/rpms/daos.spec @@ -24,7 +24,7 @@ Name: daos Version: 2.7.104 -Release: 1%{?relval}%{?dist} +Release: 2%{?relval}%{?dist} Summary: DAOS Storage Engine License: BSD-2-Clause-Patent @@ -61,8 +61,8 @@ BuildRequires: libjson-c-devel BuildRequires: boost-devel %endif %if %{with server} -BuildRequires: libpmemobj-devel >= 2.1.2-1 -BuildRequires: libpmemobj-devel < 2.1.2-2 +BuildRequires: libpmemobj-devel >= 2.1.2-2 +BuildRequires: libpmemobj-devel < 2.1.2-3 %endif BuildRequires: fused-devel %if (0%{?suse_version} >= 1500) @@ -165,12 +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.2-1 -Requires: libpmemobj1 < 2.1.2-2 +Requires: libpmemobj1 >= 2.1.2-2 +Requires: libpmemobj1 < 2.1.2-3 %else Requires: ipmctl >= 03.00.00.0468 -Requires: libpmemobj >= 2.1.2-1 -Requires: libpmemobj < 2.1.2-2 +Requires: libpmemobj >= 2.1.2-2 +Requires: libpmemobj < 2.1.2-3 %endif Requires: mercury >= %{mercury_version} Requires(post): /sbin/ldconfig diff --git a/utils/rpms/package_info.sh b/utils/rpms/package_info.sh index 11427d3fcd8..ac18abb494e 100644 --- a/utils/rpms/package_info.sh +++ b/utils/rpms/package_info.sh @@ -51,7 +51,7 @@ export argobots_version="1.2" export argobots_release="4${distro_name}" export argobots_full="${argobots_version}-${argobots_release}" export pmdk_version="2.1.2" -export pmdk_release="1${distro_name}" +export pmdk_release="2${distro_name}" export pmdk_full="${pmdk_version}-${pmdk_release}" export isal_version="2.31.1" export isal_release="8${distro_name}" diff --git a/utils/rpms/pmdk.changelog b/utils/rpms/pmdk.changelog index d4cd893efeb..b84544db216 100644 --- a/utils/rpms/pmdk.changelog +++ b/utils/rpms/pmdk.changelog @@ -1,4 +1,7 @@ %changelog +* Thu Feb 19 2026 Tomasz Gromadzki - 2.1.2-2 +- Fix the name of libpmemobj-devel for leap + * Wed Nov 05 2025 Tomasz Gromadzki - 2.1.2-1 - Update to release 2.1.2 From bc82538886f4f646e16e64394f7e2bc87b7f533e Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Fri, 20 Feb 2026 14:18:21 +0100 Subject: [PATCH 3/3] Test to use "=" instead of ">=" "<" Signed-off-by: Tomasz Gromadzki Skip-unit-test-memcheck: true Allow-unstable-test: true Skip-func-test-el9: false Skip-func-test-leap15: false Skip-fault-injection-test: true Skip-test-el-8.6-rpms: true Skip-test-leap-15-rpms: true Skip-func-hw-test: true --- utils/rpms/daos.spec | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/utils/rpms/daos.spec b/utils/rpms/daos.spec index 4e7afcc6d1b..01afdf88f9c 100644 --- a/utils/rpms/daos.spec +++ b/utils/rpms/daos.spec @@ -61,8 +61,7 @@ BuildRequires: libjson-c-devel BuildRequires: boost-devel %endif %if %{with server} -BuildRequires: libpmemobj-devel >= 2.1.2-2 -BuildRequires: libpmemobj-devel < 2.1.2-3 +BuildRequires: libpmemobj-devel = 2.1.2-2 %endif BuildRequires: fused-devel %if (0%{?suse_version} >= 1500) @@ -165,12 +164,10 @@ 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.2-2 -Requires: libpmemobj1 < 2.1.2-3 +Requires: libpmemobj1 = 2.1.2-2 %else Requires: ipmctl >= 03.00.00.0468 -Requires: libpmemobj >= 2.1.2-2 -Requires: libpmemobj < 2.1.2-3 +Requires: libpmemobj = 2.1.2-2 %endif Requires: mercury >= %{mercury_version} Requires(post): /sbin/ldconfig