Skip to content

Commit

Permalink
ci: configure flux --with-pmix-bootstrap in bionic image
Browse files Browse the repository at this point in the history
Problem: need to test --enable-pmix-bootstrap in CI and obtain
code coverage report for related code.

Add --enable-pmix-bootstrap to bionic/coverage in the CI build
matrix generator.

Add openpmix and prrte to bionic docker image:
 - prrte: export a recent commit from the prrte git repo, since the most
   recent release (1.0.0) doesn't include prterun, which is needed by
   our pmix sharness test.
 - openpmix: export a recent git commit from the openpmix git repo,
   needed to compile prrte above as it won't work with openpmix-3.2.3.
 - add build requirements of flex and libevent-dev
 - add prrte runtime requirement of ssh
  • Loading branch information
garlick committed Mar 16, 2021
1 parent ba75baa commit 723ad13
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 2 deletions.
23 changes: 23 additions & 0 deletions src/test/docker/bionic/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ RUN apt-get update \
wget \
man \
git \
flex \
ssh \
sudo \
vim \
luarocks \
Expand Down Expand Up @@ -82,6 +84,7 @@ RUN apt-get update \
libhwloc-dev \
libmpich-dev \
libs3-dev \
libevent-dev \
&& rm -rf /var/lib/apt/lists/*

# Testing utils and libs
Expand Down Expand Up @@ -113,4 +116,24 @@ RUN mkdir caliper \
&& cd ../.. \
&& rm -rf caliper

# Install openpmix, prrte
RUN mkdir prrte \
&& cd prrte \
&& git clone https://github.com/openpmix/openpmix.git \
&& git clone https://github.com/openpmix/prrte.git \
&& ls -l \
&& set -x \
&& cd openpmix \
&& git checkout fefaed568f33bf86f28afb6e45237f1ec5e4de93 \
&& ./autogen.pl \
&& ./configure --prefix=/usr --disable-static && make -j 4 install \
&& ldconfig \
&& cd .. \
&& cd prrte \
&& git checkout 477894f4720d822b15cab56eee7665107832921c \
&& ./autogen.pl \
&& ./configure --prefix=/usr && make -j 4 install \
&& cd ../.. \
&& rm -rf prrte

ENV LANG=C.UTF-8
4 changes: 2 additions & 2 deletions src/test/generate-matrix.py
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ def __str__(self):
CXX="g++8",
DISTCHECK="t",
),
args="--with-flux-security --enable-caliper",
args="--with-flux-security --enable-caliper --enable-pmix-bootstrap",
test_s3=True,
)

Expand All @@ -169,7 +169,7 @@ def __str__(self):
)

# Ubuntu: coverage
matrix.add_build(name="coverage", coverage=True, jobs=2)
matrix.add_build(name="coverage", coverage=True, jobs=2, args="--enable-pmix-bootstrap")

# Ubuntu: TEST_INSTALL
matrix.add_build(
Expand Down

0 comments on commit 723ad13

Please sign in to comment.