Skip to content

Commit 1e66f16

Browse files
authored
Merge pull request #5160 from grondo/fedora38
ci: add fedora38 builder, update flux-security default to 0.8.0
2 parents 6d95773 + c701a0b commit 1e66f16

File tree

5 files changed

+101
-2
lines changed

5 files changed

+101
-2
lines changed

src/test/docker/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ pushed to DockerHub at `fluxrm/testenv:bionic` and
4848
script still runs against the new `testenv` images, e.g.:
4949

5050
```
51-
$ for i in focal el7 el8 fedora33 fedora34 fedora35; do
51+
$ for i in focal el7 el8 fedora33 fedora34 fedora35 fedora38; do
5252
make clean &&
5353
docker build --no-cache -t fluxrm/testenv:$i src/test/docker/$i &&
5454
src/test/docker/docker-run-checks.sh -j 4 --image=$i &&

src/test/docker/docker-run-checks.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ JOBS=2
1616
MOUNT_HOME_ARGS="--volume=$HOME:/home/$USER -e HOME"
1717

1818
if test "$PROJECT" = "flux-core"; then
19-
FLUX_SECURITY_VERSION=0.7.0
19+
FLUX_SECURITY_VERSION=0.8.0
2020
POISON=t
2121
fi
2222

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
FROM fedora:38
2+
3+
LABEL maintainer="Mark Grondona <[email protected]>"
4+
5+
# Enable PowerTools for development packages
6+
RUN yum -y update \
7+
&& yum -y update \
8+
# Utilities
9+
&& yum -y install \
10+
wget \
11+
man-db \
12+
less \
13+
git \
14+
sudo \
15+
munge \
16+
ccache \
17+
lua \
18+
mpich \
19+
valgrind \
20+
jq \
21+
which \
22+
file \
23+
vim \
24+
patch \
25+
diffutils \
26+
hostname \
27+
# Compilers, autotools
28+
pkgconfig \
29+
libtool \
30+
autoconf \
31+
automake \
32+
gcc \
33+
gcc-c++ \
34+
libasan \
35+
make \
36+
cmake \
37+
# Python
38+
python3-devel \
39+
python3-cffi \
40+
python3-six \
41+
python3-yaml \
42+
python3-jsonschema \
43+
python3-sphinx \
44+
# Development dependencies
45+
libsodium-devel \
46+
zeromq-devel \
47+
czmq-devel \
48+
jansson-devel \
49+
munge-devel \
50+
ncurses-devel \
51+
lz4-devel \
52+
sqlite-devel \
53+
libuuid-devel \
54+
hwloc-devel \
55+
mpich-devel \
56+
lua-devel \
57+
valgrind-devel \
58+
libs3-devel \
59+
libarchive-devel \
60+
pam-devel \
61+
# Other deps
62+
perl-Time-HiRes \
63+
lua-posix \
64+
libfaketime \
65+
cppcheck \
66+
enchant \
67+
aspell \
68+
aspell-en \
69+
glibc-langpack-en \
70+
&& yum clean all
71+
72+
# Add /usr/bin/mpicc link so MPI tests are built
73+
RUN alternatives --install /usr/bin/mpicc mpicc /usr/lib64/mpich/bin/mpicc 100
74+
75+
ENV LANG=C.UTF-8
76+
RUN printf "LANG=C.UTF-8" > /etc/locale.conf
77+
78+
COPY config.site /usr/share/config.site
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Force libdir to /usr/lib64 if prefix=/usr on this platform
2+
if test "$prefix" = "/usr" ; then
3+
test $sysconfdir = "${prefix}/etc" && sysconfdir=/etc
4+
libdir=/usr/lib64
5+
fi
6+
:

src/test/generate-matrix.py

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,21 @@ def __str__(self):
251251
docker_tag=True,
252252
)
253253

254+
# Fedora 38
255+
# Note: caliper does not compile on Fedora 38
256+
matrix.add_build(
257+
name="fedora38 - gcc-13.1,py3.11",
258+
image="fedora38",
259+
args=(
260+
"--prefix=/usr"
261+
" --sysconfdir=/etc"
262+
" --with-systemdsystemunitdir=/etc/systemd/system"
263+
" --localstatedir=/var"
264+
" --with-flux-security"
265+
),
266+
docker_tag=True,
267+
)
268+
254269
# inception
255270
matrix.add_build(
256271
name="inception",

0 commit comments

Comments
 (0)