Skip to content

Commit d01bbb0

Browse files
committed
DAOS-18017 build: update mercury to 2.4.1rc5
remove libfabric dependency on DAOS rpm Signed-off-by: Jerome Soumagne <[email protected]>
1 parent 4e574b5 commit d01bbb0

File tree

15 files changed

+34
-509
lines changed

15 files changed

+34
-509
lines changed

ci/provisioning/post_provision_config_common.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ fi
3232
# shellcheck disable=SC1091
3333
. /etc/os-release
3434
# shellcheck disable=SC2034
35-
EXCLUDE_UPGRADE=mercury,daos,daos-\*
35+
EXCLUDE_UPGRADE=mercury,mercury-\*,daos,daos-\*
3636
if rpm -qa | grep mlnx; then
3737
# packages not to allow upgrading if MLNX OFED is installed
3838
EXCLUDE_UPGRADE+=,openmpi,\*mlnx\*,\*ucx\*

ci/provisioning/post_provision_config_common_functions.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ post_provision_config_nodes() {
323323
rm -f "$REPOS_DIR"/*_job_daos-stack_job_*_job_*.repo
324324
time dnf -y erase fio fuse ior-hpc mpich-autoload \
325325
argobots cart daos daos-client daos-spdk dpdk \
326-
libisa-l libpmemobj mercury mpich \
326+
libisa-l libpmemobj mercury mercury-libfabric mpich \
327327
pmix protobuf-c spdk libfabric libpmem \
328328
munge-libs munge slurm \
329329
slurm-example-configs slurmctld slurm-slurmmd

ci/unit/required_packages.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ pkgs="$(utils/rpms/package_version.sh argobots lib) \
2424
$(utils/rpms/package_version.sh libfabric debug) \
2525
$(utils/rpms/package_version.sh mercury dev) \
2626
$(utils/rpms/package_version.sh mercury debug) \
27+
$(utils/rpms/package_version.sh mercury lib mercury_libfabric) \
2728
$(utils/rpms/package_version.sh pmdk lib pmemobj) \
2829
$(utils/rpms/package_version.sh pmdk debug pmemobj) \
2930
$(utils/rpms/package_version.sh pmdk debug pmem) \

deps/patches/mercury/0001_na_ucx.patch

Lines changed: 0 additions & 110 deletions
This file was deleted.

deps/patches/mercury/0002_na_ucx_ep_flush.patch

Lines changed: 0 additions & 64 deletions
This file was deleted.

0 commit comments

Comments
 (0)