Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions scripts/ci/images/Dockerfile.ci-spack-ubuntu22.04-base
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ ARG SPACK_MIRROR="https://binaries.spack.io/v2025.07.0"
ARG ENABLED_ENVS="serial,ompi,mpich"
ARG EXTERNAL_PACKAGES
ARG EXTRA_VARIANTS
ARG EXTRA_SPECS
ARG PATCH_VARIANT_XROOTD


Expand Down Expand Up @@ -38,7 +39,7 @@ RUN . /spack/share/spack/setup-env.sh && \
spack config add "concretizer:unify:true" && \
if echo "$ENABLED_ENVS" | grep -q serial; then \
spack env create adios2-ci-serial && \
spack -e adios2-ci-serial add ${ADIOS_SPEC_NO_MPI} && \
spack -e adios2-ci-serial add ${ADIOS_SPEC_NO_MPI} ${EXTRA_SPECS} && \
spack -e adios2-ci-serial concretize && \
spack -e adios2-ci-serial install \
--include-build-deps \
Expand All @@ -48,7 +49,7 @@ RUN . /spack/share/spack/setup-env.sh && \
fi && \
if echo "$ENABLED_ENVS" | grep -q ompi ; then \
spack env create adios2-ci-ompi && \
spack -e adios2-ci-ompi add ${ADIOS_SPEC_OPENMPI} && \
spack -e adios2-ci-ompi add ${ADIOS_SPEC_OPENMPI} ${EXTRA_SPECS} && \
spack -e adios2-ci-ompi concretize && \
spack -e adios2-ci-ompi install \
--include-build-deps \
Expand All @@ -58,7 +59,7 @@ RUN . /spack/share/spack/setup-env.sh && \
fi && \
if echo "$ENABLED_ENVS" | grep -q mpich; then \
spack env create adios2-ci-mpich && \
spack -e adios2-ci-mpich add ${ADIOS_SPEC_MPICH} && \
spack -e adios2-ci-mpich add ${ADIOS_SPEC_MPICH} ${EXTRA_SPECS} && \
spack -e adios2-ci-mpich concretize && \
spack -e adios2-ci-mpich install \
--include-build-deps \
Expand Down
1 change: 1 addition & 0 deletions scripts/ci/images/build-ubuntu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ TAG_PREFIX="${IMAGE_TAG_PREFIX:-ghcr.io/ornladios/adios2}"
# Build the base image
${BUILD_TOOL} build --progress=plain \
--build-arg PATCH_VARIANT_XROOTD=ON \
--build-arg EXTRA_SPECS="sz3" \
--rm -f ./Dockerfile.ci-spack-ubuntu22.04-base \
-t "${TAG_PREFIX}:ci-spack-ubuntu22.04-base" \
.
Expand Down
Loading