Skip to content

CI: Update list of Docker images used in testing. #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
baagaard-usgs merged 4 commits into from
Nov 3, 2026
Merged

CI: Update list of Docker images used in testing. #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d991043
ci: Update list of Docker images used in testing.
baagaard-usgs Nov 3, 2026
6a6fe41
ci: Use uppercase for all Docker commands.
baagaard-usgs Nov 3, 2026
42c1018
ci: Update GitHub checkout action to v7.
baagaard-usgs Nov 3, 2026
cf16483
mpi: Limit application test to the number of available cores.
baagaard-usgs Nov 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions .github/workflows/ci-stage-2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,21 @@ jobs:
strategy:
matrix:
os:
- ubuntu-20.04
- ubuntu-22.04
- ubuntu-24.04
- ubuntu-24.10
- ubuntu-26.04
- ubuntu-26.10
- debian-testing
- fedora-39
- fedora-40
- rockylinux-8
- fedora-44
- fedora-45
- fedora-46
- rockylinux-9
- rockylinux-10

runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v7
with:
submodules: recursive

Expand Down
10 changes: 5 additions & 5 deletions docker/pythia-testenv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@


ARG BASE_IMAGE
from ${BASE_IMAGE} as setup
FROM ${BASE_IMAGE} AS setup
ARG TEST_COVERAGE=no
ARG PYTHON_COVERAGE=coverage3
ENV TEST_COVERAGE=${TEST_COVERAGE} PYTHON_COVERAGE=${PYTHON_COVERAGE}
Expand All @@ -12,7 +12,7 @@ LABEL maintainer="Brad Aagaard <baagaard@usgs.gov>"
USER ${TEST_USER}

# ------------------------------------------------------------------------------
from setup as configure
FROM setup AS configure

ENV src_dir=${TOPSRC_DIR}/pythia build_dir=${TOPBUILD_DIR}/pythia
COPY --chown=pylith-tester:pylith-tester . ${src_dir}
Expand All @@ -25,15 +25,15 @@ WORKDIR ${build_dir}
RUN ${src_dir}/configure --enable-testing --prefix=${INSTALL_DIR} --enable-test-coverage=${TEST_COVERAGE} --with-python-coverage=${PYTHON_COVERAGE} CPPFLAGS=-I${INSTALL_DIR}/include LDFLAGS="-L${INSTALL_DIR}/lib -L${INSTALL_DIR}/lib64 --coverage" CXXFLAGS="-g -O --coverage"

# ------------------------------------------------------------------------------
from configure as build
FROM configure AS build

RUN make -j$(nproc) && make install

# Want source directory as current directory for running test coverage script via test runner.
# Want source directory AS current directory for running test coverage script via test runner.
WORKDIR ${src_dir}

# ------------------------------------------------------------------------------
from build as test
FROM build AS test

WORKDIR ${build_dir}
RUN make check VERBOSE=1
Expand Down
4 changes: 3 additions & 1 deletion tests/pytests/mpi/test_application.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,10 @@ def test_constructor(self):
self.assertEqual("mpiapp", app.name)

def test_run(self):
max_cores = 2
app = MPIApp()
app.nodes = 3
n_cores = len(os.sched_getaffinity(0))
app.nodes = min(max_cores, n_cores) if n_cores > 0 else max_cores
app.run(argv=["mpiapp", "--launcher.command=mpiexec -n ${nodes} -host localhost:${nodes}"])
for node in range(app.nodes):
filename = app.log_filename(node)
Expand Down
Loading