Skip to content

Commit

Permalink
matrix: deprecate focal, new imgs, more arm64
Browse files Browse the repository at this point in the history
problem: We need to test the newer containers, and have only the one
image built for arm64

solution: update several of our tests to new container versions, build
noble, fedora40, el8 for arm
  • Loading branch information
trws committed Jul 20, 2024
1 parent 276520b commit a02625f
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 47 deletions.
1 change: 1 addition & 0 deletions src/test/docker/fedora40/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ RUN dnf -y install \
aspell-en \
time \
glibc-langpack-en \
lcov \
&& dnf clean all

# Add /usr/bin/mpicc link so MPI tests are built
Expand Down
73 changes: 26 additions & 47 deletions src/test/generate-matrix.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def env_add_s3(self, args, env):
def add_build(
self,
name=None,
image="bookworm",
image="fedora40",
args=default_args,
jobs=4,
env=None,
Expand Down Expand Up @@ -138,8 +138,8 @@ def __str__(self):

matrix = BuildMatrix()

# Debian: no args
matrix.add_build(name="bookworm")
# Fedora40: no args
matrix.add_build(name="fedora40")

# Debian: 32b
matrix.add_build(
Expand All @@ -149,19 +149,21 @@ def __str__(self):
docker_tag=True,
)

# Debian: arm64, expensive, only on master and tags, only install
# debian/Fedora40: arm64, expensive, only on master and tags, only install
if matrix.branch == "master" or matrix.tag:
matrix.add_build(
name="bookworm - arm64",
image="bookworm",
platform="linux/arm64",
docker_tag=True,
command_args="--install-only ",
)
for d in ("bookworm", "noble", "fedora40", "el9"):
matrix.add_build(
name=f"{d} - arm64",
image="{d}",
platform="linux/arm64",
docker_tag=True,
command_args="--install-only ",
)

# Debian: gcc-12, content-s3, distcheck
matrix.add_build(
name="bookworm - gcc-12,content-s3,distcheck",
image="bookworm",
env=dict(
CC="gcc-12",
CXX="g++12",
Expand All @@ -171,14 +173,13 @@ def __str__(self):
test_s3=True,
)

# Ubuntu: py3.11,clang-15
# fedora40: clang-18
matrix.add_build(
name="bookworm - py3.11,clang-15",
name="fedora40 - clang-18",
env=dict(
CC="clang-15",
CXX="clang++-15",
CC="clang-18",
CXX="clang++-18",
CFLAGS="-O2 -gdwarf-4",
PYTHON_VERSION="3.11",
chain_lint="t",
),
args="--with-flux-security",
Expand All @@ -196,17 +197,18 @@ def __str__(self):

# Ubuntu: TEST_INSTALL
matrix.add_build(
name="jammy - test-install",
image="jammy",
name="noble - test-install",
image="noble",
env=dict(
TEST_INSTALL="t",
),
docker_tag=True,
)

# Debian: TEST_INSTALL
# el9: TEST_INSTALL
matrix.add_build(
name="bookworm - test-install",
name="el9 - test-install",
image="el9",
env=dict(
TEST_INSTALL="t",
),
Expand Down Expand Up @@ -240,39 +242,17 @@ def __str__(self):
args="--with-flux-security --enable-caliper",
)

# Fedora 34
matrix.add_build(
name="fedora34 - gcc-11.2,py3.9",
image="fedora34",
docker_tag=True,
)

# Fedora 38
# Note: caliper does not compile on Fedora 38
matrix.add_build(
name="fedora38 - gcc-13.1,py3.11",
image="fedora38",
args=(
"--prefix=/usr"
" --sysconfdir=/etc"
" --with-systemdsystemunitdir=/etc/systemd/system"
" --localstatedir=/var"
" --with-flux-security"
),
docker_tag=True,
)

# Fedora 39
# Note: caliper does not compile on Fedora 38
# Fedora 40
matrix.add_build(
name="fedora39 - gcc-13.2,py3.12",
image="fedora39",
name="fedora40 - gcc-14.1,py3.12",
image="fedora40",
args=(
"--prefix=/usr"
" --sysconfdir=/etc"
" --with-systemdsystemunitdir=/etc/systemd/system"
" --localstatedir=/var"
" --with-flux-security"
" --enable-caliper"
),
env=dict(PSM3_HAL="loopback"),
docker_tag=True,
Expand All @@ -294,7 +274,6 @@ def __str__(self):
# inception
matrix.add_build(
name="inception",
image="bookworm",
command_args="--inception",
)

Expand Down

0 comments on commit a02625f

Please sign in to comment.