Skip to content

Commit

Permalink
Merge pull request #2260 from KyleFromKitware/debian-sid-docker
Browse files Browse the repository at this point in the history
Revive Debian builds
  • Loading branch information
Chuck Atkins authored May 18, 2020
2 parents 02e3bad + 6599052 commit 7b29d5b
Show file tree
Hide file tree
Showing 7 changed files with 48 additions and 90 deletions.
17 changes: 7 additions & 10 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ jobs:
el7-gnu8-ohpc,
el7-gnu8-openmpi-ohpc,
suse-pgi,
suse-pgi-openmpi ]
#debian-sid,
#debian-sid-openmpi ]
suse-pgi-openmpi,
debian-sid,
debian-sid-openmpi ]
include:
- jobname: el7
container: ornladios/adios2:ci-el7
Expand All @@ -40,15 +40,12 @@ jobs:
container: ornladios/adios2:ci-suse-pgi
- jobname: suse-pgi-openmpi
container: ornladios/adios2:ci-suse-pgi-openmpi
#- jobname: debian-sid
# container: debian:sid
#- jobname: debian-sid-openmpi
# container: debian:sid
- jobname: debian-sid
container: ornladios/adios2:ci-debian-sid
- jobname: debian-sid-openmpi
container: ornladios/adios2:ci-debian-sid

steps:
- name: Bootstrap
run: /bin/sh -c "apt-get update && apt-get dist-upgrade -y && apt-get install -y git"
if: contains(matrix.jobname, 'debian')
- uses: actions/checkout@v2
with:
ref: ${{ github.event.pull_request.head.sha }}
Expand Down
7 changes: 5 additions & 2 deletions scripts/ci/cmake/ci-debian-sid-openmpi.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,16 @@ ADIOS2_LIBRARY_SUFFIX:STRING=_openmpi
ADIOS2_EXECUTABLE_SUFFIX:STRING=.openmpi
MPIEXEC_EXTRA_FLAGS:STRING=--allow-run-as-root --oversubscribe
MPI_C_COMPILER:FILEPATH=/usr/bin/mpicc.openmpi
MPI_CXX_COMPILER:FILEPATH=/usr/bin/mpic++.openmpi
MPI_Fortran_COMPILER:FILEPATH=/usr/bin/mpif77.openmpi
MPIEXEC_EXECUTABLE:FILEPATH=/usr/bin/mpiexec.openmpi
HDF5_C_COMPILER_EXECUTABLE:FILEPATH=/usr/bin/h5pcc.openmpi
")

set(CTEST_TEST_ARGS
PARALLEL_LEVEL 1
)
set(CTEST_CMAKE_GENERATOR "Ninja")

set(ADIOS_TEST_REPEAT 0)
list(APPEND CTEST_UPDATE_NOTES_FILES "${CMAKE_CURRENT_LIST_FILE}")
include(${CMAKE_CURRENT_LIST_DIR}/ci-common.cmake)
4 changes: 2 additions & 2 deletions scripts/ci/cmake/ci-debian-sid.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ ADIOS2_USE_SST:BOOL=ON
ADIOS2_USE_ZeroMQ:BOOL=ON
ADIOS2_LIBRARY_SUFFIX:STRING=_serial
ADIOS2_EXECUTABLE_SUFFIX:STRING=.serial
HDF5_C_COMPILER_EXECUTABLE:FILEPATH=/usr/bin/h5cc
")

set(CTEST_CMAKE_GENERATOR "Ninja")

set(ADIOS_TEST_REPEAT 0)
list(APPEND CTEST_UPDATE_NOTES_FILES "${CMAKE_CURRENT_LIST_FILE}")
include(${CMAKE_CURRENT_LIST_DIR}/ci-common.cmake)
4 changes: 2 additions & 2 deletions scripts/ci/images/build-native-images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ function build_partially_squashed_image()
echo "************************************************************"
echo "* Building fully squashed root base images *"
echo "************************************************************"
ROOT_BASE_IMAGES="el7-base suse-pgi-base fedora-sanitizers-base"
ROOT_BASE_IMAGES="el7-base suse-pgi-base fedora-sanitizers-base debian-sid"
for IMAGE in ${ROOT_BASE_IMAGES}
do
echo "${IMAGE}"
Expand Down Expand Up @@ -58,7 +58,7 @@ done
echo "************************************************************"
echo "* Push all images *"
echo "************************************************************"
ALL_IMAGES="el7-base el7 el7-gnu8-ohpc-base el7-gnu8-ohpc el7-gnu8-openmpi-ohpc el7-intel-ohpc-base el7-intel-ohpc el7-intel-openmpi-ohpc suse-pgi-base suse-pgi suse-pgi-openmpi fedora-sanitizers-base fedora-ubsan"
ALL_IMAGES="el7-base el7 el7-gnu8-ohpc-base el7-gnu8-ohpc el7-gnu8-openmpi-ohpc el7-intel-ohpc-base el7-intel-ohpc el7-intel-openmpi-ohpc suse-pgi-base suse-pgi suse-pgi-openmpi fedora-sanitizers-base fedora-ubsan debian-sid"
for IMAGE in ${ALL_IMAGES}
do
echo "${IMAGE}"
Expand Down
32 changes: 32 additions & 0 deletions scripts/ci/images/debian-sid/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
FROM debian:sid

RUN apt-get update && \
apt-get dist-upgrade -y --no-install-recommends && \
apt-get install -y --no-install-recommends \
curl \
python3-all \
ca-certificates \
git \
cmake \
ninja-build \
make \
g++ \
gfortran \
pkg-config \
libpugixml-dev \
libyaml-cpp-dev \
pybind11-dev \
libgtest-dev \
nlohmann-json3-dev \
libpython3-dev \
python3-numpy \
python3-mpi4py \
libblosc-dev \
libbz2-dev \
libpng-dev \
libczmq-dev \
libopenmpi-dev \
libhdf5-serial-dev \
libhdf5-openmpi-dev \
libfabric-dev \
libffi-dev
38 changes: 0 additions & 38 deletions scripts/ci/setup/ci-debian-sid-openmpi.sh

This file was deleted.

36 changes: 0 additions & 36 deletions scripts/ci/setup/ci-debian-sid.sh

This file was deleted.

0 comments on commit 7b29d5b

Please sign in to comment.