From 751fe1fd4bae2c62d32985a24757d8e5306e9d1f Mon Sep 17 00:00:00 2001
From: Kyle Edwards <kyle.edwards@kitware.com>
Date: Fri, 15 May 2020 12:03:08 -0400
Subject: [PATCH] Revive Debian Sid builds with pre-built Docker image

---
 .github/workflows/build-and-test.yml         | 17 ++++-----
 scripts/ci/cmake/ci-debian-sid-openmpi.cmake |  5 +++
 scripts/ci/cmake/ci-debian-sid.cmake         |  2 ++
 scripts/ci/setup/ci-debian-sid-openmpi.sh    | 38 --------------------
 scripts/ci/setup/ci-debian-sid.sh            | 36 -------------------
 5 files changed, 14 insertions(+), 84 deletions(-)
 delete mode 100755 scripts/ci/setup/ci-debian-sid-openmpi.sh
 delete mode 100755 scripts/ci/setup/ci-debian-sid.sh

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index dd77df7583..00d7c3a934 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -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
@@ -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 }}
diff --git a/scripts/ci/cmake/ci-debian-sid-openmpi.cmake b/scripts/ci/cmake/ci-debian-sid-openmpi.cmake
index e174e59960..600de71761 100644
--- a/scripts/ci/cmake/ci-debian-sid-openmpi.cmake
+++ b/scripts/ci/cmake/ci-debian-sid-openmpi.cmake
@@ -17,6 +17,11 @@ 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:FILEPATH=/usr/bin/h5pcc.openmpi
 ")
 
 set(CTEST_TEST_ARGS
diff --git a/scripts/ci/cmake/ci-debian-sid.cmake b/scripts/ci/cmake/ci-debian-sid.cmake
index ea45d09b6d..2735ffe606 100644
--- a/scripts/ci/cmake/ci-debian-sid.cmake
+++ b/scripts/ci/cmake/ci-debian-sid.cmake
@@ -15,6 +15,8 @@ ADIOS2_USE_SST:BOOL=ON
 ADIOS2_USE_ZeroMQ:BOOL=ON
 ADIOS2_LIBRARY_SUFFIX:STRING=_serial
 ADIOS2_EXECUTABLE_SUFFIX:STRING=.serial
+
+HDF5_C_COMPILER:FILEPATH=/usr/bin/h5cc
 ")
 
 set(CTEST_CMAKE_GENERATOR "Ninja")
diff --git a/scripts/ci/setup/ci-debian-sid-openmpi.sh b/scripts/ci/setup/ci-debian-sid-openmpi.sh
deleted file mode 100755
index 9c3c2db7bd..0000000000
--- a/scripts/ci/setup/ci-debian-sid-openmpi.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-set -x
-set -e
-
-# This installation is done at test time rather than image build time because
-# Debian Sid is a moving target. Packages are being updated every day. We want
-# to make sure ADIOS is always tested against the latest Debian environment.
-
-apt-get update
-apt-get dist-upgrade -y
-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 \
-  libopenmpi-dev \
-  libczmq-dev \
-  libhdf5-openmpi-dev \
-  libfabric-dev \
-  libffi-dev
diff --git a/scripts/ci/setup/ci-debian-sid.sh b/scripts/ci/setup/ci-debian-sid.sh
deleted file mode 100755
index dc1cdd628a..0000000000
--- a/scripts/ci/setup/ci-debian-sid.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-set -x
-set -e
-
-# This installation is done at test time rather than image build time because
-# Debian Sid is a moving target. Packages are being updated every day. We want
-# to make sure ADIOS is always tested against the latest Debian environment.
-
-apt-get update
-apt-get dist-upgrade -y
-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 \
-  libblosc-dev \
-  libbz2-dev \
-  libpng-dev \
-  libczmq-dev \
-  libhdf5-serial-dev \
-  libfabric-dev \
-  libffi-dev