From 5cb828c27883ad5d03c337c7f1163506e712578c Mon Sep 17 00:00:00 2001 From: Jim Garlick Date: Tue, 10 Dec 2024 06:26:22 -0800 Subject: [PATCH 1/3] testsuite: allow pmix.nsdir to exist Problem: a test that verifies pmix.nsdir does not exist fails with openpmix 4.2.9. Allow the test to fail for now. --- t/t0002-basic.t | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/t/t0002-basic.t b/t/t0002-basic.t index b716715..8bd3964 100755 --- 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 \ From d7f3723b826937f4b0cd4e8b9c1016f806dca416 Mon Sep 17 00:00:00 2001 From: Jim Garlick Date: Tue, 10 Dec 2024 06:20:18 -0800 Subject: [PATCH 2/3] ci: update openpmix v4 version Problem: modern ompi v5 releases require a newer version of openpmix than we are currently building in ci. Replace openpmix 4.2.4 builds with 4.2.9 (the latest in the v4 series). --- .github/workflows/main.yml | 8 ++++---- src/test/docker/jammy/Dockerfile | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b0662f2..7013057 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -25,14 +25,14 @@ jobs: - name: "jammy - chain_lint" image: "jammy" ompi_branch: "v5.0.0rc12" - openpmix_branch: "v4.2.3" + 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" + openpmix_branch: "v4.2.9" coverage: false env: DISTCHECK: t @@ -45,14 +45,14 @@ jobs: - name: "jammy - coverage" image: "jammy" ompi_branch: "v5.0.0rc12" - openpmix_branch: "v4.2.3" + openpmix_branch: "v4.2.9" coverage: true env: COVERAGE: t - name: "fedora34 - ompi v5.0.x" image: "fedora34" ompi_branch: "v5.0.0rc12" - openpmix_branch: "v4.2.3" + 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 index 4f0b0f3..efc5b2a 100644 --- 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 \ From 3ecff1cac0ff0fa299ede4c58425e91c4e17ecf5 Mon Sep 17 00:00:00 2001 From: Jim Garlick Date: Tue, 10 Dec 2024 06:31:18 -0800 Subject: [PATCH 3/3] ci: update ompi v5 version Problem: we are testing an early pre-release of ompi v5 Replace ompi v5.0.0rc12 builds with 5.0.6 (the latest in the v5 series). --- .github/workflows/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7013057..fdc6072 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -24,14 +24,14 @@ jobs: include: - name: "jammy - chain_lint" image: "jammy" - ompi_branch: "v5.0.0rc12" + 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" + ompi_branch: "v5.0.6" openpmix_branch: "v4.2.9" coverage: false env: @@ -44,14 +44,14 @@ jobs: env: {} - name: "jammy - coverage" image: "jammy" - ompi_branch: "v5.0.0rc12" + 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" + ompi_branch: "v5.0.6" openpmix_branch: "v4.2.9" coverage: false env: {}