From fe6e7b70bdbe64232aa4ed727723a53032ecbe5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Offringa?= <offringa@gmail.com>
Date: Thu, 8 Sep 2022 18:38:38 +0000
Subject: [PATCH] Remove testing from dockerfiles
---
quality/collector.cpp | 2 --
scripts/docker/Centos8 | 2 +-
scripts/docker/Debian | 4 ++--
scripts/docker/Ubuntu18-gcc-11 | 4 ++--
scripts/docker/Ubuntu18-nogui | 5 ++---
scripts/docker/Ubuntu20 | 4 ++--
scripts/docker/{Ubuntu21 => Ubuntu22} | 6 +++---
.../docker/{Ubuntu21-clang-libcxx => Ubuntu22-clang-libcxx} | 4 ++--
8 files changed, 14 insertions(+), 17 deletions(-)
rename scripts/docker/{Ubuntu21 => Ubuntu22} (74%)
rename scripts/docker/{Ubuntu21-clang-libcxx => Ubuntu22-clang-libcxx} (94%)
diff --git a/quality/collector.cpp b/quality/collector.cpp
index 16bb4907..21b0e940 100644
--- a/quality/collector.cpp
+++ b/quality/collector.cpp
@@ -27,11 +27,9 @@ void Collector::Collect(const std::string& filename,
const std::string stationName = ms->GetStationName();
std::vector<BandInfo> bands(bandCount);
std::vector<std::vector<double>> frequencies(bandCount);
- unsigned totalChannels = 0;
for (unsigned b = 0; b < bandCount; ++b) {
bands[b] = ms->GetBandInfo(b);
frequencies[b].resize(bands[b].channels.size());
- totalChannels += bands[b].channels.size();
for (unsigned c = 0; c < bands[b].channels.size(); ++c) {
frequencies[b][c] = bands[b].channels[c].frequencyHz;
}
diff --git a/scripts/docker/Centos8 b/scripts/docker/Centos8
index 0f90111a..d22e3c0b 100644
--- a/scripts/docker/Centos8
+++ b/scripts/docker/Centos8
@@ -51,6 +51,6 @@ WORKDIR /src
RUN mkdir /build && cd /build && cmake ../src
-RUN cd /build && make -j`nproc --all` && make install && make check -j`nproc --all`
+RUN cd /build && make -j`nproc --all` && make install
RUN cd /build/python && echo "import aoflagger" | python3
diff --git a/scripts/docker/Debian b/scripts/docker/Debian
index 7261d663..c2c566de 100644
--- a/scripts/docker/Debian
+++ b/scripts/docker/Debian
@@ -10,7 +10,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && \
liblua5.3-dev \
python3 \
libpython3-dev \
- libboost-date-time-dev libboost-system-dev libboost-test-dev \
+ libboost-date-time-dev libboost-system-dev \
libgtkmm-3.0-dev \
libcfitsio-dev \
libfftw3-dev \
@@ -23,6 +23,6 @@ WORKDIR /src
RUN mkdir /build && cd /build && cmake ../src
-RUN cd /build && make -j`nproc --all` && make install && make check -j`nproc --all`
+RUN cd /build && make -j`nproc --all` && make install
RUN cd /build/python && echo "import aoflagger" | python3.10
diff --git a/scripts/docker/Ubuntu18-gcc-11 b/scripts/docker/Ubuntu18-gcc-11
index a54f0807..00a09ec5 100644
--- a/scripts/docker/Ubuntu18-gcc-11
+++ b/scripts/docker/Ubuntu18-gcc-11
@@ -10,7 +10,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && \
liblua5.3-dev \
python3 \
libpython3-dev \
- libboost-date-time-dev libboost-system-dev libboost-test-dev \
+ libboost-date-time-dev libboost-system-dev \
libgtkmm-3.0-dev \
libcfitsio-dev \
libfftw3-dev \
@@ -30,5 +30,5 @@ WORKDIR /src
RUN \
mkdir /build && cd /build && cmake ../src && \
- cd /build && make -j`nproc` && make install && make check -j`nproc` && \
+ cd /build && make -j`nproc` && make install && \
cd /build/python && echo "import aoflagger" | python3
diff --git a/scripts/docker/Ubuntu18-nogui b/scripts/docker/Ubuntu18-nogui
index 5688bb21..26cefb5c 100644
--- a/scripts/docker/Ubuntu18-nogui
+++ b/scripts/docker/Ubuntu18-nogui
@@ -11,7 +11,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && \
python3 \
python3-distutils \
libpython3-dev \
- libboost-date-time-dev libboost-system-dev libboost-test-dev \
+ libboost-date-time-dev libboost-system-dev \
libcfitsio-dev \
libfftw3-dev \
libgsl-dev \
@@ -33,7 +33,6 @@ RUN \
cd /build && \
cmake ../src && \
make -j`nproc` && \
- make install && \
- make check -j`nproc`
+ make install
RUN cd /build/python && echo "import aoflagger" | python3
diff --git a/scripts/docker/Ubuntu20 b/scripts/docker/Ubuntu20
index 190ef1ba..0625a051 100644
--- a/scripts/docker/Ubuntu20
+++ b/scripts/docker/Ubuntu20
@@ -10,7 +10,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && \
liblua5.3-dev \
python3 \
libpython3-dev \
- libboost-date-time-dev libboost-system-dev libboost-test-dev \
+ libboost-date-time-dev libboost-system-dev \
libgtkmm-3.0-dev \
libcfitsio-dev \
libfftw3-dev \
@@ -23,6 +23,6 @@ WORKDIR /src
RUN mkdir /build && cd /build && cmake ../src
-RUN cd /build && make -j`nproc --all` && make install && make check -j`nproc --all`
+RUN cd /build && make -j`nproc --all` && make install
RUN cd /build/python && echo "import aoflagger" | python3
diff --git a/scripts/docker/Ubuntu21 b/scripts/docker/Ubuntu22
similarity index 74%
rename from scripts/docker/Ubuntu21
rename to scripts/docker/Ubuntu22
index 1175ad23..36028cc5 100644
--- a/scripts/docker/Ubuntu21
+++ b/scripts/docker/Ubuntu22
@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:22.04
RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && \
apt-get install -y \
@@ -9,7 +9,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && \
libblas-dev liblapack-dev \
liblua5.3-dev \
libpython3-dev \
- libboost-date-time-dev libboost-system-dev libboost-test-dev \
+ libboost-date-time-dev libboost-system-dev \
libgtkmm-3.0-dev \
libcfitsio-dev \
libfftw3-dev \
@@ -22,6 +22,6 @@ WORKDIR /src
RUN mkdir /build && cd /build && cmake ../src
-RUN cd /build && make -j`nproc --all` && make install && make check -j`nproc --all`
+RUN cd /build && make -j`nproc --all` && make install
RUN cd /build/python && echo "import aoflagger" | python3
diff --git a/scripts/docker/Ubuntu21-clang-libcxx b/scripts/docker/Ubuntu22-clang-libcxx
similarity index 94%
rename from scripts/docker/Ubuntu21-clang-libcxx
rename to scripts/docker/Ubuntu22-clang-libcxx
index ffb6555c..1f0c883e 100644
--- a/scripts/docker/Ubuntu21-clang-libcxx
+++ b/scripts/docker/Ubuntu22-clang-libcxx
@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:22.04
RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && \
apt-get install -y \
@@ -55,6 +55,6 @@ WORKDIR /src
RUN mkdir /build && cd /build && cmake ../src -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DCMAKE_CXX_FLAGS="-stdlib=libc++"
-RUN cd /build && make -j`nproc --all` && make install && make check -j`nproc --all`
+RUN cd /build && make -j`nproc --all` && make install
RUN cd /build/python && echo "import aoflagger" | python3
--
GitLab