diff --git a/testing/docker/ubuntu14.04/Dockerfile b/testing/docker/ubuntu14.04/Dockerfile deleted file mode 100644 index 06f93266..00000000 --- a/testing/docker/ubuntu14.04/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM ubuntu:14.04 - -WORKDIR /data -RUN apt-get update -RUN apt-get install -y libopenmpi-dev openmpi-bin mpich git pkg-config gcc-4.7 nano make -RUN apt-get install -y sudo hdf5-tools libhdf5-mpi-dev - diff --git a/testing/docker/ubuntu22.04-all-backends/Dockerfile b/testing/docker/ubuntu22.04-all-backends/Dockerfile new file mode 100644 index 00000000..db77faa5 --- /dev/null +++ b/testing/docker/ubuntu22.04-all-backends/Dockerfile @@ -0,0 +1,11 @@ +FROM ubuntu:22.04 + +WORKDIR /data +RUN apt-get update +RUN apt-get install -y libopenmpi-dev openmpi-bin libhdf5-openmpi-dev git pkg-config gcc libaio-dev libpnetcdf-dev +RUN apt-get install -y sudo make +RUN git clone https://github.com/hpc/ior.git +RUN cd ior ; ./bootstrap +RUN cd ior ; ./configure --with-aio --with-hdf5 --with-ncmpi LDFLAGS=-L/usr/lib/x86_64-linux-gnu/hdf5/openmpi CFLAGS=-I/usr/include/hdf5/openmpi && make -j + +# librados-dev diff --git a/testing/docker/ubuntu22.04/Dockerfile b/testing/docker/ubuntu22.04/Dockerfile new file mode 100644 index 00000000..c0f9584c --- /dev/null +++ b/testing/docker/ubuntu22.04/Dockerfile @@ -0,0 +1,6 @@ +FROM ubuntu:22.04 + +WORKDIR /data +RUN apt-get update +RUN apt-get install -y libopenmpi-dev openmpi-bin libhdf5-openmpi-dev git pkg-config gcc libaio-dev libpnetcdf-dev +RUN apt-get install -y sudo diff --git a/testing/docker/ubuntu14.04/run-test.sh b/testing/docker/ubuntu22.04/run-test.sh similarity index 66% rename from testing/docker/ubuntu14.04/run-test.sh rename to testing/docker/ubuntu22.04/run-test.sh index 020cad06..23f5ce2c 100755 --- a/testing/docker/ubuntu14.04/run-test.sh +++ b/testing/docker/ubuntu22.04/run-test.sh @@ -3,31 +3,32 @@ BUILD="$1" groupadd -g $3 testuser useradd -r -u $2 -g testuser testuser - ERROR=0 function runTest(){ FLAVOR="$1" MPI_DIR="$2" + export IOR_MPIRUN="$3" echo $FLAVOR in $BUILD/$FLAVOR update-alternatives --set mpi $MPI_DIR sudo -u testuser mkdir -p $BUILD/$FLAVOR pushd $BUILD/$FLAVOR > /dev/null - sudo -u testuser /data/configure --with-hdf5 CFLAGS=-I/usr/lib/x86_64-linux-gnu/hdf5/openmpi/include LDFLAGS=-L/usr/lib/x86_64-linux-gnu/hdf5/openmpi/lib|| exit 1 - sudo -u testuser make V=1 || exit 1 + sudo -u testuser /data/configure || exit 1 + sudo -u testuser make || exit 1 #define the alias ln -sf $(which mpiexec.$FLAVOR) /usr/bin/mpiexec cd /data/ + sudo -u testuser IOR_BIN_DIR=$BUILD/$FLAVOR/src IOR_OUT=$BUILD/$FLAVOR/test ./testing/basic-tests.sh ERROR=$(($ERROR + $?)) popd > /dev/null } -runTest openmpi /usr/lib/openmpi/include -runTest mpich /usr/include/mpich +export MPI_ARGS="" +runTest openmpi /usr/lib/openmpi/include "mpiexec -n" exit $ERROR