DAOS-18017 mercury: update to 2.4.1rc5

debian/changelog

@@ -1,3 +1,9 @@
+mercury (2.4.1~rc5-1) unstable; urgency=medium
+  [ Jerome Soumagne ]
+  * Update to 2.4.1rc5
+
+ -- Jerome Soumagne <jerome.soumagne@hpe.com>  Mon, 27 Oct 2025 16:00:00 -0600
+
 mercury (2.4.0-5) unstable; urgency=medium
   [ Joseph Moore ]
   * Update release number to differentiate from test RPMs for prior issue.

mercury.spec

@@ -1,7 +1,9 @@
 Name: mercury
-Version: 2.4.0
-Release: 5%{?dist}
+Version: 2.4.1~rc5
+Release: 1%{?dist}
 
+# --without libfabric build switch
+%bcond_without libfabric
 # --without ucx build switch
 %bcond_without ucx
 
@@ -15,13 +17,13 @@ License:  BSD
 Group:    Development/Libraries
 URL:      http://mercury-hpc.github.io/
 Source0:  https://github.com/mercury-hpc/%{name}/releases/download/v%{dl_version}/%{name}-%{dl_version}.tar.bz2
-Patch0:   na_ucx.patch
-Patch1:   na_ucx_ep_flush.patch
 
-BuildRequires:  libfabric-devel >= 1.20
 BuildRequires:  cmake
 BuildRequires:  boost-devel
 BuildRequires:  gcc-c++
+%if %{with libfabric}
+BuildRequires:  libfabric-devel >= 1.20
+%endif
 %if 0%{?suse_version}
 %if %{with ucx}
 BuildRequires: libucp-devel, libucs-devel, libuct-devel
@@ -55,6 +57,16 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 Mercury development headers and libraries.
 
 
+%if %{with libfabric}
+%package libfabric
+Summary:  Mercury with libfabric
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description libfabric
+Mercury plugin to support the libfabric transport.
+%endif
+
+
 %if %{with ucx}
 %package ucx
 Summary:  Mercury with UCX
@@ -96,7 +108,9 @@ Mercury plugin to support the UCX transport.
 %if %{with ucx}
         -DNA_USE_UCX:BOOL=ON                              \
 %endif
+%if %{with libfabric}
         -DNA_USE_OFI:BOOL=ON
+%endif
 %cmake_build
 
 %install
@@ -114,7 +128,11 @@ Mercury plugin to support the UCX transport.
 %{_bindir}/hg_*
 %{_bindir}/na_*
 %{_libdir}/*.so.*
+
+%if %{with libfabric}
+%files libfabric
 %{_libdir}/mercury/libna_plugin_ofi.so
+%endif
 
 %if %{with ucx}
 %files ucx
@@ -132,8 +150,12 @@ Mercury plugin to support the UCX transport.
 %{_libdir}/cmake/
 
 %changelog
+* Mon Oct 27 2025 Jerome Soumagne <jerome.soumagne@hpe.com> - 2.4.1~rc5-1
+- Update to 2.4.1rc5
+- Separate libfabric plugin from main build to align with ucx plugin.
+
 * Wed Jun 25 2025 Joseph Moore <joseph.moore@hpe.com> - 2.4.0-5
-- Update release number to differentiate from test RPMs for prior issue..
+- Update release number to differentiate from test RPMs for prior issue.
 
 * Tue Mar 11 2025 Joseph Moore <joseph.moore@hpe.com> - 2.4.0-4
 - Change to addr_release for handling of "already present" warning.

packaging/Dockerfile.mockbuild

@@ -16,6 +16,7 @@ LABEL maintainer="daos@daos.groups.io"
 ARG REPO_FILE_URL
 ARG DAOS_LAB_CA_FILE_URL
 ARG REPOSITORY_NAME
+
 # script to install OS updates basic tools and daos dependencies
 # COPY ./utils/scripts/install-fedora.sh /tmp/install.sh
 # script to setup local repo if available
@@ -26,9 +27,9 @@ RUN chmod +x /tmp/repo-helper.sh &&                 \
     rm -f /tmp/repo-helper.sh
 
 # Install basic tools
-RUN dnf -y install mock make                                        \
-                   rpm-build createrepo rpmlint redhat-lsb-core git \
-                   python-srpm-macros rpmdevtools &&                \
+RUN dnf -y install mock make                         \
+                   rpm-build createrepo rpmlint git  \
+                   python-srpm-macros rpmdevtools && \
     dnf -y clean all
 
 # use same UID as host and default value of 1000 if not specified

packaging/scripts/repo-helper-fedora.sh

@@ -9,9 +9,26 @@ set -uex
 : "${FVERSION:=latest}"
 : "${REPOSITORY_NAME:=artifactory}"
 : "${archive:=}"
-if [ "$FVERSION" != "latest" ]; then
-    archive="-archive"
-fi
+
+is_fedora_eol() {
+    local eol_url fedora_version eol_date today
+    if [ -n "$REPO_FILE_URL" ]; then
+        eol_url="${REPO_FILE_URL%repo-files/}eol-proxy/fedora.json"
+        fedora_version=$(grep VERSION_ID /etc/os-release | cut -d= -f2 | \
+                         tr -d '"')
+        eol_date=$(curl -s "$eol_url" | sed 's/},{/}\n{/g' | \
+                   grep "cycle\":\"$fedora_version\"" | \
+                   sed -n 's/.*"eol":"\([^"]*\)".*/\1/p')
+        if [[ -z "$eol_date" ]]; then
+            return 1 # Assume NOT EOL if data missing
+        fi
+        today=$(date +%Y-%m-%d)
+        [[ "$today" > "$eol_date" ]]
+        return $?  # Return 0 if EOL, 1 if not
+    else
+        return 1 # Assume NOT EOL if url is missing
+    fi
+}
 
 # shellcheck disable=SC2120
 disable_repos () {
@@ -58,11 +75,14 @@ install_optional_ca() {
 if [ -n "$REPO_FILE_URL" ]; then
     install_curl
     install_optional_ca
+    if is_fedora_eol; then
+        archive="-archive"
+    fi
     mkdir -p /etc/yum.repos.d
     pushd /etc/yum.repos.d/
     curl -k --noproxy '*' -sSf                                  \
          -o "daos_ci-fedora${archive}-${REPOSITORY_NAME}.repo"  \
-         "{$REPO_FILE_URL}daos_ci-fedora${archive}-${REPOSITORY_NAME}.repo"
+         "${REPO_FILE_URL}daos_ci-fedora${archive}-${REPOSITORY_NAME}.repo"
     disable_repos /etc/yum.repos.d/
     popd
 fi