From 58772e91af4802be61d8d4ca7482714b6e537854 Mon Sep 17 00:00:00 2001
From: wiliamhuang <wiliam_huang@hotmail.com>
Date: Fri, 27 May 2022 15:31:31 -0500
Subject: [PATCH] DAOS-10629 libfabric: upgrade to v1.15.1-1 (#9085)

Signed-off-by: Lei Huang <lei.huang@intel.com>
---
 debian/changelog                 | 6 ++++++
 debian/control                   | 2 +-
 utils/build.config               | 2 +-
 utils/docker/Dockerfile.centos.7 | 3 +--
 utils/rpms/daos.spec             | 7 +++++--
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4892543f4f6..4f81e90da0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+daos (2.0.2-7) unstable; urgency=medium
+  [ Lei Huang ]
+  * Update libfabric to v1.15.1-1 with critical performance patches
+
+ -- Lei Huang <lei.huang@intel.com>  Fri, 27 May 2022 10:50:00 -0500
+
 daos (2.0.2-6) unstable; urgency=medium
   [ Tom Nabarro ]
   * Restrict SPDK version to less than 22
diff --git a/debian/control b/debian/control
index 309428dcf58..722b83c0897 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: daos-stack <daos@daos.groups.io>
 Build-Depends: debhelper (>= 10),
                dh-python,
                libcmocka-dev,
-               libfabric-dev (>= 1.15.0~rc3-1),
+               libfabric-dev (>= 1.15.1-1),
                libhwloc-dev,
                libopenmpi-dev,
                libssl-dev,
diff --git a/utils/build.config b/utils/build.config
index 78766a4113e..529c0270d99 100644
--- a/utils/build.config
+++ b/utils/build.config
@@ -7,7 +7,7 @@ PMDK = 1.11.0
 ISAL = v2.30.0
 ISAL_CRYPTO = v2.23.0
 SPDK = v21.07
-OFI = v1.15.0rc3
+OFI = v1.15.1
 OPENPA = v1.0.4
 MERCURY = v2.1.0rc4
 PSM2 = PSM2_11.2.78
diff --git a/utils/docker/Dockerfile.centos.7 b/utils/docker/Dockerfile.centos.7
index 07007fe02b9..e7c78072201 100644
--- a/utils/docker/Dockerfile.centos.7
+++ b/utils/docker/Dockerfile.centos.7
@@ -31,6 +31,7 @@ RUN set -e;                                                      \
     if [ -n "$REPO_FILE_URL" ]; then                             \
         dnf -y --quiet config-manager --disable epel;            \
     fi;                                                          \
+    dnf -y update epel-release;                                  \
     dnf -y clean all
 
 ARG JENKINS_URL
@@ -52,8 +53,6 @@ baseurl=${JENKINS_URL}job/daos-stack/job/$repo/job/$branch/$build_number/artifac
 enabled=1\n\
 gpgcheck=False\n" >> /etc/yum.repos.d/$repo:$branch:$build_number.repo;   \
         cat /etc/yum.repos.d/$repo:$branch:$build_number.repo; \
-        dnf -y repolist; \
-        dnf --disablerepo=\* --enablerepo=$repo:$branch:$build_number makecache; \
     done
 
 # Install OS updates and package.  Include basic tools and daos dependencies
diff --git a/utils/rpms/daos.spec b/utils/rpms/daos.spec
index 8101e26f0ed..55686cc9c39 100644
--- a/utils/rpms/daos.spec
+++ b/utils/rpms/daos.spec
@@ -3,7 +3,7 @@
 %define agent_svc_name daos_agent.service
 
 %global mercury_version 2.1.0~rc4-4%{?dist}
-%global libfabric_version 1.15.0~rc3-1
+%global libfabric_version 1.15.1-1
 %global __python %{__python3}
 
 %if (0%{?rhel} >= 8)
@@ -14,7 +14,7 @@
 
 Name:          daos
 Version:       2.0.2
-Release:       6%{?relval}%{?dist}
+Release:       7%{?relval}%{?dist}
 Summary:       DAOS Storage Engine
 
 License:       BSD-2-Clause-Patent
@@ -528,6 +528,9 @@ getent passwd daos_agent >/dev/null || useradd -s /sbin/nologin -r -g daos_agent
 # No files in a meta-package
 
 %changelog
+* Fri May 27 2022 Lei Huang <lei.huang@intel.com> 2.0.2-7
+- Update libfabric to v1.15.1-1 with critical performance patches
+
 * Tue May 17 2022 Tom Nabarro <tom.nabarro@intel.com> 2.0.2-6
 - Restrict spdk version to less than v22