DAOS-18017 build: update mercury to 2.4.1rc4

remove libfabric dependency on DAOS rpm

PR-repos: mercury@PR-134:lastBuild

Signed-off-by: Jerome Soumagne <[email protected]>

Author: soumagne

ci/provisioning/post_provision_config_common.sh

@@ -32,7 +32,7 @@ fi
 # shellcheck disable=SC1091
 . /etc/os-release
 # shellcheck disable=SC2034
-EXCLUDE_UPGRADE=mercury,daos,daos-\*
+EXCLUDE_UPGRADE=mercury,mercury-\*,daos,daos-\*
 if rpm -qa | grep mlnx; then
     # packages not to allow upgrading if MLNX OFED is installed
     EXCLUDE_UPGRADE+=,openmpi,\*mlnx\*,\*ucx\*

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 mercury mercury-libfabric mpich \
                      pmix protobuf-c spdk libfabric libpmem        \
                      munge-libs munge slurm                        \
                      slurm-example-configs slurmctld slurm-slurmmd

ci/unit/required_packages.sh

@@ -24,6 +24,7 @@ pkgs="$(utils/rpms/package_version.sh argobots lib)                  \
       $(utils/rpms/package_version.sh libfabric debug)               \
       $(utils/rpms/package_version.sh mercury dev)                   \
       $(utils/rpms/package_version.sh mercury debug)                 \
+      $(utils/rpms/package_version.sh mercury lib mercury_libfabric) \
       $(utils/rpms/package_version.sh pmdk lib pmemobj)              \
       $(utils/rpms/package_version.sh pmdk debug pmemobj)            \
       $(utils/rpms/package_version.sh pmdk debug pmem)               \