Skip to content

Commit

Permalink
ci: migrate from focal to jammy, el8
Browse files Browse the repository at this point in the history
Problem: focal CI builds are failing.

There seems to be a linkage problem with libjansson in the
fluxrm/flux-core:focal image.

Move most focal builders to jammy.

There seems to be a problem with the configure script generated
for ompi 2.x and 3.x in jammy:

checking for struct sockaddr_in... yes
checking if --with-cuda is set... not set (--with-cuda=)
./configure: line 13031: syntax error near unexpected token `)'
./configure: line 13031: `    )'

Move those builders to el8.

Tidy up builder descriptions.
  • Loading branch information
garlick committed Dec 10, 2024
1 parent d782a00 commit 4e2b7df
Show file tree
Hide file tree
Showing 2 changed files with 74 additions and 14 deletions.
28 changes: 14 additions & 14 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
60 changes: 60 additions & 0 deletions src/test/docker/jammy/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
FROM fluxrm/flux-core:jammy

ARG USER=fluxuser
ARG UID=1000
ARG OMPI_BRANCH=v5.0.x
ARG OPENPMIX_BRANCH=v4.2.4

RUN \
if test "$USER" != "fluxuser"; then \
sudo groupadd -g $UID $USER \
&& sudo useradd -g $USER -u $UID -d /home/$USER -m $USER \
&& sudo sh -c "printf \"$USER ALL= NOPASSWD: ALL\\n\" >> /etc/sudoers" \
&& sudo adduser $USER sudo ; \
fi

# remove installed mpich / openmpi / pmix
RUN sudo apt purge -yy mpich libmpich-dev \
&& sudo apt clean

# install ompi prereqs
RUN sudo apt-get update \
&& sudo apt-get -qq install -y --no-install-recommends \
libevent-dev \
flex \
openssh-client \
&& sudo apt clean \
&& sudo rm -rf /var/lib/apt/lists/*

# build/install openpmix
RUN cd /tmp \
&& git clone -b ${OPENPMIX_BRANCH} \
--recursive --depth=1 https://github.com/openpmix/openpmix \
&& cd openpmix \
&& git branch \
&& ./autogen.pl \
&& ./configure --prefix=/usr \
--enable-debug --disable-sphinx \
&& make -j $(nproc) \
&& sudo make install \
&& cd .. \
&& rm -rf openpmix

# build/install ompi
RUN cd /tmp \
&& git clone -b ${OMPI_BRANCH} \
--recursive --depth=1 https://github.com/open-mpi/ompi \
&& cd ompi \
&& git branch \
&& ./autogen.pl \
&& ./configure --prefix=/usr \
--disable-man-pages --enable-debug --enable-mem-debug \
--with-pmix=external --with-libevent --disable-sphinx \
&& make -j $(nproc) \
&& sudo make install \
&& cd .. \
&& rm -rf ompi

USER $USER
WORKDIR /home/$USER

0 comments on commit 4e2b7df

Please sign in to comment.