Merge pull request #102 from garlick/ci_jammy

ci: migrate from focal to jammy, el8
flux-framework · Dec 10, 2024 · 5ff05f3 · 5ff05f3
2 parents 19933ad + d176491
commit 5ff05f3
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 138 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -22,28 +22,28 @@ jobs:
     strategy:
       matrix:
         include:
-        - name: "focal - ompi v5.0.x, chain_lint"
-          image: "focal"
+        - name: "jammy - chain_lint"
+          image: "jammy"
           ompi_branch: "v5.0.0rc12"
           openpmix_branch: "v4.2.3"
           coverage: false
           env:
             chain_lint: t
-        - name: "el8 - ompi v5.0.x, distcheck"
+        - name: "el8 - distcheck"
           image: "el8"
           ompi_branch: "v5.0.0rc12"
           openpmix_branch: "v4.2.3"
           coverage: false
           env:
             DISTCHECK: t
-        - name: "el8 - pmix v3.2.3, ompi v4.1.4"
+        - name: "el8 - ompi v4.1.4"
           image: "el8"
           ompi_branch: "v4.1.4"
           openpmix_branch: "v3.2.3"
           coverage: false
           env: {}
-        - name: "coverage"
-          image: "focal"
+        - name: "jammy - coverage"
+          image: "jammy"
           ompi_branch: "v5.0.0rc12"
           openpmix_branch: "v4.2.3"
           coverage: true
@@ -55,26 +55,26 @@ jobs:
           openpmix_branch: "v4.2.3"
           coverage: false
           env: {}
-        - name: "focal - ompi v4.1.x"
-          image: "focal"
+        - name: "jammy - ompi v4.1.x"
+          image: "jammy"
           ompi_branch: "v4.1.x"
           openpmix_branch: "v4.2.2"
           coverage: false
           env: {}
-        - name: "focal - ompi v4.0.x"
-          image: "focal"
+        - name: "jammy - ompi v4.0.x"
+          image: "jammy"
           ompi_branch: "v4.0.x"
           openpmix_branch: "v4.2.2"
           coverage: false
           env: {}
-        - name: "focal - ompi v3.1.x"
-          image: "focal"
+        - name: "el8 - ompi v3.1.x"
+          image: "el8"
           ompi_branch: "v3.1.x"
           openpmix_branch: "v4.2.2"
           coverage: false
           env: {}
-        - name: "focal - ompi v3.0.x"
-          image: "focal"
+        - name: "el8 - ompi v3.0.x"
+          image: "el8"
           ompi_branch: "v3.0.x"
           openpmix_branch: "v4.2.2"
           coverage: false

diff --git a/src/test/docker/bionic/Dockerfile b/src/test/docker/bionic/Dockerfile
diff --git a/src/test/docker/docker-run-checks.sh b/src/test/docker/docker-run-checks.sh
@@ -11,7 +11,7 @@ PROJECT=flux-pmix
 BASE_DOCKER_REPO=fluxrm/flux-core
 
 WORKDIR=/usr/src
-IMAGE=focal
+IMAGE=jammy
 JOBS=2
 MOUNT_HOME_ARGS="--volume=$HOME:/home/$USER -e HOME"
 

diff --git a/src/test/docker/el7/Dockerfile b/src/test/docker/el7/Dockerfile
diff --git a/src/test/docker/focal/Dockerfile → src/test/docker/jammy/Dockerfile b/src/test/docker/focal/Dockerfile → src/test/docker/jammy/Dockerfile
@@ -1,9 +1,9 @@
-FROM fluxrm/flux-core:focal
+FROM fluxrm/flux-core:jammy
 
 ARG USER=fluxuser
 ARG UID=1000
 ARG OMPI_BRANCH=v5.0.x
-ARG OPENPMIX_BRANCH=v4.2.2
+ARG OPENPMIX_BRANCH=v4.2.4
 
 RUN \
  if test "$USER" != "fluxuser"; then  \
@@ -13,11 +13,13 @@ RUN \
    && sudo adduser $USER sudo ; \
  fi
 
-# remove installed mpich / openmpi / pmix
+# remove installed mpich
 RUN sudo apt purge -yy mpich libmpich-dev \
- openmpi-bin openmpi-common libopenmpi-dev libopenmpi3 libpmix2 \
  && sudo apt clean
 
+# remove mca dir from hand-installed openpmix which will be overwritten below
+RUN sudo rm -rf /usr/lib/pmix
+
 # install ompi prereqs
 RUN sudo apt-get update \
  && sudo apt-get -qq install -y --no-install-recommends \