DAOS-18017 build: update mercury to 2.4.1rc5

remove libfabric dependency on DAOS rpm

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

Author: soumagne

.github/workflows/bullseye-coverage.yml

@@ -563,11 +563,13 @@ jobs:
                 STAGE_TAGS+=",provider"
                 if [[ '${{ matrix.stage }}' = *\ Verbs\ * ]]; then
                   FTEST_ARG+=' --provider ofi+verbs'
+                  INST_RPMS+=' mercury-libfabric'
                 elif [[ '${{ matrix.stage }}' = *\ UCX\ * ]]; then
                   FTEST_ARG+=' --provider ucx+dc_x'
                   INST_RPMS+=' mercury-ucx'
                 elif [[ '${{ matrix.stage }}' = *\ TCP\ * ]]; then
                   FTEST_ARG+=' --provider ofi+tcp'
+                  INST_RPMS+=' mercury-libfabric'
                 else
                     echo 'Unknown provider in ${{ matrix.stage }}'
                     exit 1

.github/workflows/rpm-build-and-test.yml

@@ -572,11 +572,13 @@ jobs:
                 STAGE_TAGS+=",provider"
                 if [[ '${{ matrix.stage }}' = *\ Verbs\ * ]]; then
                   FTEST_ARG+=' --provider ofi+verbs'
+                  INST_RPMS+=' mercury-libfabric'
                 elif [[ '${{ matrix.stage }}' = *\ UCX\ * ]]; then
                   FTEST_ARG+=' --provider ucx+dc_x'
                   INST_RPMS+=' mercury-ucx'
                 elif [[ '${{ matrix.stage }}' = *\ TCP\ * ]]; then
                   FTEST_ARG+=' --provider ofi+tcp'
+                  INST_RPMS+=' mercury-libfabric'
                 else
                     echo 'Unknown provider in ${{ matrix.stage }}'
                     exit 1

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/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)               \