From 00b22db5e53664857c7c35b55632e5751a031742 Mon Sep 17 00:00:00 2001
From: Raghu Raja <raghunch@amazon.com>
Date: Wed, 29 May 2024 00:12:06 +0000
Subject: [PATCH] distcheck: Use the EFA installer like the other steps

Signed-off-by: Raghu Raja <raghunch@amazon.com>
---
 .github/workflows/distcheck.yaml | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/distcheck.yaml b/.github/workflows/distcheck.yaml
index 77b54d7bf..781f9eaa5 100644
--- a/.github/workflows/distcheck.yaml
+++ b/.github/workflows/distcheck.yaml
@@ -47,8 +47,9 @@ jobs:
         run: |
           curl -O https://efa-installer.amazonaws.com/aws-efa-installer-${{ matrix.efainstaller }}.tar.gz
           tar -xf aws-efa-installer-*.tar.gz
-          cd aws-efa-installer/RPMS/${{ matrix.efainstallerdir }}/x86_64
-          find . | grep rpm$ | xargs sudo yum -y localinstall
+          pushd aws-efa-installer/
+              sudo ./efa_installer.sh -y --skip-kmod
+          popd
       - name: Install hwloc, utilities.
         run: |
           sudo yum -y install hwloc-devel yum-utils
@@ -178,22 +179,12 @@ jobs:
           packages: liblttng-ust-dev
           version: lttng
 
-      - name: Install Libfabric
+      - name: Fetch and Install EFA Installer Dependencies
         run: |
-          # We're just doing distchecks, so it is fine if we
-          # just grab the latest master and built a lean build.
-          git clone --depth 1 https://github.com/ofiwg/libfabric.git
-          pushd libfabric
-          ./autogen.sh
-
-          export CC="${{ matrix.realcc || matrix.cc }}"
-          ./configure --prefix="$PWD/install" \
-                      --disable-sockets \
-                      --disable-udp \
-                      --disable-mrail \
-                      --disable-opx
-          make -j "$(nproc)"
-          make install
+          curl -O https://efa-installer.amazonaws.com/aws-efa-installer-latest.tar.gz
+          tar -xf aws-efa-installer-*.tar.gz
+          pushd aws-efa-installer/
+              sudo ./efa_installer.sh -y --skip-kmod
           popd
 
       - name: Build Plugin
@@ -207,11 +198,13 @@ jobs:
           ./autogen.sh
           if [ "${{ matrix.sdk }}" == "cuda" ]
           then
-            ./configure --with-libfabric="$PWD/libfabric/install" \
+            ./configure --with-mpi=/opt/amazon/openmpi \
+                        --with-libfabric=/opt/amazon/efa \
                         --with-cuda=/usr/local/cuda/ \
                         --enable-platform-aws
           else
-            ./configure --with-libfabric="$PWD/libfabric/install" \
+            ./configure --with-mpi=/opt/amazon/openmpi \
+                        --with-libfabric=/opt/amazon/efa \
                         --enable-neuron \
                         --enable-platform-aws
           fi