Cleanup "special" builds

Remove references to HWLOC1 Signed-off-by: Ralph Castain <[email protected]>
openpmix · Oct 4, 2023 · 95c1832 · 95c1832
1 parent c380156
commit 95c1832
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 77 deletions.
diff --git a/ci-builds/pmix/01-build-hwloc1x.sh b/ci-builds/pmix/01-build-hwloc1x.sh
diff --git a/ci-builds/pmix/05-build-v4-with-prrte.sh b/ci-builds/pmix/05-build-v4-with-prrte.sh
@@ -1,8 +1,8 @@
 #!/bin/bash -ex
 
 #
-# PRRTE requires a minimum of OpenPMIx v4.0.x
-# If we change PMIx v4.0 branch then check to make
+# PRRTE requires a minimum of OpenPMIx v4.2.x
+# If we change PMIx v4.2 branch then check to make
 # sure that PRRTE still builds correctly.
 #
 
@@ -23,9 +23,9 @@ if [ ! -d ${_PMIX_CHECKOUT} ] ; then
     exit 1
 fi
 
-# Only run if we are modifying the v4.0 branch
+# Only run if we are modifying the v4.2 branch
 if [ -n "$PR_TARGET_BRANCH" ] ; then
-    if [[ "$PR_TARGET_BRANCH" != "v4.0" ]] ; then
+    if [[ "$PR_TARGET_BRANCH" != "v4.2" ]] ; then
         echo "Warning: This build does not work for this branch"
         exit 0
     fi
@@ -58,7 +58,7 @@ export AUTOMAKE_JOBS=20
 ./configure --prefix=${_BUILD_DIR}/install-pmix \
             --disable-debug \
             --with-libevent=${LIBEVENT_INSTALL_PATH} \
-            --with-hwloc=${HWLOC1_INSTALL_PATH}
+            --with-hwloc=${HWLOC_INSTALL_PATH}
 
 #--------------------------------
 # Make
@@ -91,7 +91,7 @@ export AUTOMAKE_JOBS=20
             --disable-debug \
             --with-pmix=${_BUILD_DIR}/install-pmix \
             --with-libevent=${LIBEVENT_INSTALL_PATH} \
-            --with-hwloc=${HWLOC1_INSTALL_PATH}
+            --with-hwloc=${HWLOC_INSTALL_PATH}
 
 #--------------------------------
 # Make

diff --git a/ci-builds/prrte/01-build-hwloc1x.sh b/ci-builds/prrte/01-build-hwloc1x.sh
@@ -62,7 +62,7 @@ export AUTOMAKE_JOBS=20
             --enable-static \
             --enable-shared \
             --with-libevent=${LIBEVENT_INSTALL_PATH} \
-            --with-hwloc=${HWLOC1_INSTALL_PATH}
+            --with-hwloc=${HWLOC_INSTALL_PATH}
 
 #--------------------------------
 # Make
@@ -95,7 +95,7 @@ export AUTOMAKE_JOBS=20
             --disable-debug \
             --with-pmix=${_BUILD_DIR}/install-pmix \
             --with-libevent=${LIBEVENT_INSTALL_PATH} \
-            --with-hwloc=${HWLOC1_INSTALL_PATH}
+            --with-hwloc=${HWLOC_INSTALL_PATH}
 
 #--------------------------------
 # Make

diff --git a/ci-builds/prrte/02-build-w-pmix-v4.0.sh b/ci-builds/prrte/02-build-w-pmix-v4.0.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -ex
 
 #
-# PRRTE requires a minimum of OpenPMIx v4.2.2
+# PRRTE requires a minimum of OpenPMIx v4.2.4
 #
 
 #--------------------------------
@@ -33,11 +33,15 @@ cd $_BUILD_DIR
 #--------------------------------
 # PMIx Build
 #--------------------------------
-if [ -n "$PR_TARGET_BRANCH" ] &&  [ "$PR_TARGET_BRANCH" == "v3.0" ] ; then
-  git clone -b v4.2 --recurse-submodules https://github.com/openpmix/openpmix.git
+if [ -n "$PR_TARGET_BRANCH" ] ; then
+    if [ "$PR_TARGET_BRANCH" == "v3.0" ] || [ "$PR_TARGET_BRANCH" == "v3.1" ] ; then
+        git clone -b v4.2 --recurse-submodules https://github.com/openpmix/openpmix.git
+    else
+        # no need to do another build as we have tested against pmix master elsewhere
+        exit 0
+    fi
 else
-  # no need to do another build as we have tested against pmix master elsewhere
-  exit 0
+    exit 0
 fi
 cd openpmix
 
@@ -53,7 +57,7 @@ export AUTOMAKE_JOBS=20
 ./configure --prefix=${_BUILD_DIR}/install-pmix \
             --disable-debug \
             --with-libevent=${LIBEVENT_INSTALL_PATH} \
-            --with-hwloc=${HWLOC1_INSTALL_PATH}
+            --with-hwloc=${HWLOC_INSTALL_PATH}
 
 #--------------------------------
 # Make
@@ -86,7 +90,7 @@ export AUTOMAKE_JOBS=20
             --disable-debug \
             --with-pmix=${_BUILD_DIR}/install-pmix \
             --with-libevent=${LIBEVENT_INSTALL_PATH} \
-            --with-hwloc=${HWLOC1_INSTALL_PATH}
+            --with-hwloc=${HWLOC_INSTALL_PATH}
 
 #--------------------------------
 # Make