From 18fe1e4a9dc5f15a9ab91dfb87b117ef09885e59 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Wed, 18 Feb 2026 14:29:52 +0100 Subject: [PATCH 1/3] DAOS-18602 common: pin PMDK version to 2.1.2-1 All validation steps on release/2.6 branch use PMDK 2.1.2-1, the latest available in artifactory. This PR lets PMDK version to be change in artifactory without any impact to release/2.6 branch. Allow-unstable-test: true Skip-func-test-leap15: false Signed-off-by: Tomasz Gromadzki --- .../post_provision_config_common_functions.sh | 4 ++-- utils/build.config | 5 ++--- utils/rpms/daos.spec | 11 ++++++++--- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ci/provisioning/post_provision_config_common_functions.sh b/ci/provisioning/post_provision_config_common_functions.sh index dbf02072bb8..fb422be1a18 100755 --- a/ci/provisioning/post_provision_config_common_functions.sh +++ b/ci/provisioning/post_provision_config_common_functions.sh @@ -1,7 +1,7 @@ #!/bin/bash # # Copyright 2022-2023 Intel Corporation. -# Copyright 2025 Hewlett Packard Enterprise Development LP +# Copyright 2025-2026 Hewlett Packard Enterprise Development LP # # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -322,7 +322,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 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/build.config b/utils/build.config index ab70e14dcb4..3503fa1fb3a 100644 --- a/utils/build.config +++ b/utils/build.config @@ -4,7 +4,7 @@ component=daos [commit_versions] argobots=v1.2 fuse=fuse-3.16.2 -pmdk=2.1.0 +pmdk=2.1.2 isal=v2.30.0 isal_crypto=v2.24.0 spdk=v22.01.2 @@ -16,7 +16,7 @@ ucx=v1.14.1 [repos] argobots=https://github.com/pmodels/argobots.git fuse=https://github.com/libfuse/libfuse.git -pmdk=https://github.com/pmem/pmdk.git +pmdk=https://github.com/daos-stack/pmdk.git isal=https://github.com/intel/isa-l.git isal_crypto=https://github.com/intel/isa-l_crypto.git spdk=https://github.com/spdk/spdk.git @@ -29,5 +29,4 @@ ucx=https://github.com/openucx/ucx.git spdk=https://github.com/spdk/spdk/commit/b0aba3fcd5aceceea530a702922153bc75664978.diff,https://github.com/spdk/spdk/commit/445a4c808badbad3942696ecf16fa60e8129a747.diff fuse=https://github.com/libfuse/libfuse/commit/c9905341ea34ff9acbc11b3c53ba8bcea35eeed8.diff mercury=https://github.com/mercury-hpc/mercury/commit/0a7756d4ef2f329fa7caa8e4052a099a91816f2f.diff,https://github.com/mercury-hpc/mercury/commit/e9eff75beee31bce6e8d6ea6841652f453a26d71.diff,https://github.com/mercury-hpc/mercury/commit/be5f9eb8415e46cfe9e12dcf5b82db67fccb34d2.diff,https://github.com/mercury-hpc/mercury/commit/2b6ce8622706195a6d432b77ba9c5b7b013bea76.diff,https://github.com/mercury-hpc/mercury/commit/f62eeb5273f8cd47b9a0ca2e0bfd7c0e9518f0b8.diff -pmdk=https://github.com/pmem/pmdk/commit/2abe15ac0b4eed894b6768cd82a3b0a7c4336284.diff argobots=https://github.com/pmodels/argobots/pull/397/commits/411e5b344642ebc82190fd8b125db512e5b449d1.diff,https://github.com/pmodels/argobots/commit/bb0c908abfac4bfe37852eee621930634183c6aa.diff diff --git a/utils/rpms/daos.spec b/utils/rpms/daos.spec index c8bfd14f46a..87ae48b0b2a 100644 --- a/utils/rpms/daos.spec +++ b/utils/rpms/daos.spec @@ -23,7 +23,7 @@ Name: daos Version: 2.6.4 -Release: 16%{?relval}%{?dist} +Release: 17%{?relval}%{?dist} Summary: DAOS Storage Engine License: BSD-2-Clause-Patent @@ -156,11 +156,13 @@ 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-3.suse1500 +Requires: libpmemobj1 >= 2.1.2-1 +Requires: libpmemobj1 < 2.1.2-2 Requires: libfabric1 >= %{libfabric_version} %else Requires: ipmctl >= 03.00.00.0468 -Requires: libpmemobj >= 2.1.0-6%{?dist} +Requires: libpmemobj >= 2.1.2-1 +Requires: libpmemobj < 2.1.2-2 %endif Requires: libfabric >= %{libfabric_version} Requires: mercury-libfabric >= %{mercury_version} @@ -635,6 +637,9 @@ getent passwd daos_agent >/dev/null || useradd -s /sbin/nologin -r -g daos_agent # No files in a shim package %changelog +* Wed Feb 18 2026 Tomasz Gromadzki 2.6.4-17 +- Pin PMDK (libpmemobj) version to 2.1.2-1 + * Thu Feb 05 2026 Jerome Soumagne 2.6.4-16 - Require mercury-libfabric to always install libfabric plugin - Bump mercury min version to 2.4.1 From fcd7e2d5c3b989514a2428ffd1261bdbece0fa22 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Thu, 19 Feb 2026 11:53:25 +0100 Subject: [PATCH 2/3] PMDK source code location changed in a separate PR https://github.com/daos-stack/daos/pull/17574 Signed-off-by: Tomasz Gromadzki --- utils/build.config | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/utils/build.config b/utils/build.config index 3503fa1fb3a..ab70e14dcb4 100644 --- a/utils/build.config +++ b/utils/build.config @@ -4,7 +4,7 @@ component=daos [commit_versions] argobots=v1.2 fuse=fuse-3.16.2 -pmdk=2.1.2 +pmdk=2.1.0 isal=v2.30.0 isal_crypto=v2.24.0 spdk=v22.01.2 @@ -16,7 +16,7 @@ ucx=v1.14.1 [repos] argobots=https://github.com/pmodels/argobots.git fuse=https://github.com/libfuse/libfuse.git -pmdk=https://github.com/daos-stack/pmdk.git +pmdk=https://github.com/pmem/pmdk.git isal=https://github.com/intel/isa-l.git isal_crypto=https://github.com/intel/isa-l_crypto.git spdk=https://github.com/spdk/spdk.git @@ -29,4 +29,5 @@ ucx=https://github.com/openucx/ucx.git spdk=https://github.com/spdk/spdk/commit/b0aba3fcd5aceceea530a702922153bc75664978.diff,https://github.com/spdk/spdk/commit/445a4c808badbad3942696ecf16fa60e8129a747.diff fuse=https://github.com/libfuse/libfuse/commit/c9905341ea34ff9acbc11b3c53ba8bcea35eeed8.diff mercury=https://github.com/mercury-hpc/mercury/commit/0a7756d4ef2f329fa7caa8e4052a099a91816f2f.diff,https://github.com/mercury-hpc/mercury/commit/e9eff75beee31bce6e8d6ea6841652f453a26d71.diff,https://github.com/mercury-hpc/mercury/commit/be5f9eb8415e46cfe9e12dcf5b82db67fccb34d2.diff,https://github.com/mercury-hpc/mercury/commit/2b6ce8622706195a6d432b77ba9c5b7b013bea76.diff,https://github.com/mercury-hpc/mercury/commit/f62eeb5273f8cd47b9a0ca2e0bfd7c0e9518f0b8.diff +pmdk=https://github.com/pmem/pmdk/commit/2abe15ac0b4eed894b6768cd82a3b0a7c4336284.diff argobots=https://github.com/pmodels/argobots/pull/397/commits/411e5b344642ebc82190fd8b125db512e5b449d1.diff,https://github.com/pmodels/argobots/commit/bb0c908abfac4bfe37852eee621930634183c6aa.diff From 0312668138a33fffeb3bc597121e3470627398e0 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Fri, 20 Feb 2026 15:19:50 +0100 Subject: [PATCH 3/3] Use "=" instead of ">=" and "<" Signed-off-by: Tomasz Gromadzki --- utils/rpms/daos.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/utils/rpms/daos.spec b/utils/rpms/daos.spec index 87ae48b0b2a..fdaedc4044d 100644 --- a/utils/rpms/daos.spec +++ b/utils/rpms/daos.spec @@ -156,13 +156,11 @@ 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-1 Requires: libfabric1 >= %{libfabric_version} %else Requires: ipmctl >= 03.00.00.0468 -Requires: libpmemobj >= 2.1.2-1 -Requires: libpmemobj < 2.1.2-2 +Requires: libpmemobj = 2.1.2-1 %endif Requires: libfabric >= %{libfabric_version} Requires: mercury-libfabric >= %{mercury_version}