Merge pull request #103 from garlick/ci_update

ci: build newer openpmix / ompi releases
flux-framework · Dec 11, 2024 · 25309f3 · 25309f3
2 parents 266ca25 + 3ecff1c
commit 25309f3
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -24,15 +24,15 @@ jobs:
         include:
         - name: "jammy - chain_lint"
           image: "jammy"
-          ompi_branch: "v5.0.0rc12"
-          openpmix_branch: "v4.2.3"
+          ompi_branch: "v5.0.6"
+          openpmix_branch: "v4.2.9"
           coverage: false
           env:
             chain_lint: t
         - name: "el8 - distcheck"
           image: "el8"
-          ompi_branch: "v5.0.0rc12"
-          openpmix_branch: "v4.2.3"
+          ompi_branch: "v5.0.6"
+          openpmix_branch: "v4.2.9"
           coverage: false
           env:
             DISTCHECK: t
@@ -44,15 +44,15 @@ jobs:
           env: {}
         - name: "jammy - coverage"
           image: "jammy"
-          ompi_branch: "v5.0.0rc12"
-          openpmix_branch: "v4.2.3"
+          ompi_branch: "v5.0.6"
+          openpmix_branch: "v4.2.9"
           coverage: true
           env:
             COVERAGE: t
-        - name: "fedora34 - ompi v5.0.x"
+        - name: "fedora34 - ompi v5.0.6"
           image: "fedora34"
-          ompi_branch: "v5.0.0rc12"
-          openpmix_branch: "v4.2.3"
+          ompi_branch: "v5.0.6"
+          openpmix_branch: "v4.2.9"
           coverage: false
           env: {}
         - name: "jammy - ompi v4.1.x"

diff --git a/src/test/docker/jammy/Dockerfile b/src/test/docker/jammy/Dockerfile
@@ -3,7 +3,7 @@ FROM fluxrm/flux-core:jammy
 ARG USER=fluxuser
 ARG UID=1000
 ARG OMPI_BRANCH=v5.0.x
-ARG OPENPMIX_BRANCH=v4.2.4
+ARG OPENPMIX_BRANCH=v4.2.9
 
 RUN \
  if test "$USER" != "fluxuser"; then  \

diff --git a/t/t0002-basic.t b/t/t0002-basic.t
@@ -108,10 +108,11 @@ test_expect_success 'pmix.job.napps is set to 1' '
 		${GETKEY} --proc=* pmix.job.napps >pmix.job.napps.out &&
 	test_cmp pmix.job.napps.exp pmix.job.napps.out
 '
+# pmix.nsdir appears to be automatically set in openpmix 4.2.9, but not
+# in the earlier releases we were testing (up to 4.2.4).
 test_expect_success 'pmix.nsdir is NOT set' '
-	test_must_fail flux run \
-		${GETKEY} --proc=* pmix.nsdir 2>pmix.nsdir.err &&
-	grep NOT-FOUND pmix.nsdir.err
+	test_might_fail flux run \
+		${GETKEY} --proc=* pmix.nsdir
 '
 test_expect_success '2n4p pmix.hname is set' '
 	run_timeout 30 flux run -N2 -n4 \