tcwg-base-*: Use make -j$(nproc) when building CMake

We used -j1 to avoid memory exhaustion on armhf builders, but since we
moved to more powerful machines we can remove this restriction.

See LSS-1149.

Change-Id: I30c1a1ac1cd94743172f41ec63c597bbe35b7717

8 files changed, 31 insertions, 39 deletions

diff --git a/bionic-amd64-tcwg-base/Dockerfile b/bionic-amd64-tcwg-base/Dockerfile
index 26b78e5b..d61cdb4f 100644
--- a/bionic-amd64-tcwg-base/Dockerfile
+++ b/bionic-amd64-tcwg-base/Dockerfile
@@ -211,13 +211,12 @@ RUN cd /tmp \
  && rm -rf /tmp/openocd
 
 # Install cmake v3.16 (same as in upcoming Ubuntu Focal images)
-# Don't build in parallel for the sake of armhf-01, which runs out of RAM
 RUN cd /tmp \
  && git clone -b v3.16.6 --single-branch --depth 1 https://github.com/Kitware/CMake.git \
  && cd /tmp/CMake \
- && ./bootstrap --parallel=1 \
- && make -j1 \
- && make -j1 install \
+ && ./bootstrap --parallel=$(nproc --all) \
+ && make -j$(nproc --all) \
+ && make -j$(nproc --all) install \
  && cd /tmp \
  && rm -rf /tmp/CMake
 
@@ -238,4 +237,4 @@ VOLUME /tmp
 
 EXPOSE 22
 CMD ["/usr/sbin/sshd", "-D"]
-# checksum: a606815dfb539c2087d798c16bbb030c
+# checksum: f81fab4940438641fd170452be7a5198
diff --git a/bionic-arm64-tcwg-base/Dockerfile b/bionic-arm64-tcwg-base/Dockerfile
index b745f8ad..8a3ea0dc 100644
--- a/bionic-arm64-tcwg-base/Dockerfile
+++ b/bionic-arm64-tcwg-base/Dockerfile
@@ -172,13 +172,12 @@ RUN apt-get update \
  && ln -s /usr/lib/linux-tools/4.18.0-13-generic /usr/lib/linux-tools/tx1_64
 
 # Install cmake v3.16 (same as in upcoming Ubuntu Focal images)
-# Don't build in parallel for the sake of armhf-01, which runs out of RAM
 RUN cd /tmp \
  && git clone -b v3.16.6 --single-branch --depth 1 https://github.com/Kitware/CMake.git \
  && cd /tmp/CMake \
- && ./bootstrap --parallel=1 \
- && make -j1 \
- && make -j1 install \
+ && ./bootstrap --parallel=$(nproc --all) \
+ && make -j$(nproc --all) \
+ && make -j$(nproc --all) install \
  && cd /tmp \
  && rm -rf /tmp/CMake
 
@@ -199,4 +198,4 @@ VOLUME /tmp
 
 EXPOSE 22
 CMD ["/usr/sbin/sshd", "-D"]
-# checksum: f0b12d9af4613185604094aa932fcc17
+# checksum: ad48f367b55f42982f53c0aef5551d7d
diff --git a/bionic-armhf-tcwg-base/Dockerfile b/bionic-armhf-tcwg-base/Dockerfile
index fe38cb98..214cee86 100644
--- a/bionic-armhf-tcwg-base/Dockerfile
+++ b/bionic-armhf-tcwg-base/Dockerfile
@@ -172,13 +172,12 @@ RUN apt-get update \
  && ln -s /usr/lib/linux-tools/4.18.0-13-generic /usr/lib/linux-tools/tx1_64
 
 # Install cmake v3.16 (same as in upcoming Ubuntu Focal images)
-# Don't build in parallel for the sake of armhf-01, which runs out of RAM
 RUN cd /tmp \
  && git clone -b v3.16.6 --single-branch --depth 1 https://github.com/Kitware/CMake.git \
  && cd /tmp/CMake \
- && ./bootstrap --parallel=1 \
- && make -j1 \
- && make -j1 install \
+ && ./bootstrap --parallel=$(nproc --all) \
+ && make -j$(nproc --all) \
+ && make -j$(nproc --all) install \
  && cd /tmp \
  && rm -rf /tmp/CMake
 
@@ -199,4 +198,4 @@ VOLUME /tmp
 
 EXPOSE 22
 CMD ["linux32", "/usr/sbin/sshd", "-D"]
-# checksum: c852e5f1072afa088cb6683a6bb2c12c
+# checksum: 9d7081c6153fdd9b32e73e4086cce4ef
diff --git a/tcwg-base/Dockerfile.in b/tcwg-base/Dockerfile.in
index 034d4f10..c405da37 100644
--- a/tcwg-base/Dockerfile.in
+++ b/tcwg-base/Dockerfile.in
@@ -269,13 +269,12 @@ RUN cd /tmp \
 
 #if DISTRO_xenial || DISTRO_bionic
 # Install cmake v3.16 (same as in upcoming Ubuntu Focal images)
-# Don't build in parallel for the sake of armhf-01, which runs out of RAM
 RUN cd /tmp \
  && git clone -b v3.16.6 --single-branch --depth 1 https://github.com/Kitware/CMake.git \
  && cd /tmp/CMake \
- && ./bootstrap --parallel=1 \
- && make -j1 \
- && make -j1 install \
+ && ./bootstrap --parallel=$(nproc --all) \
+ && make -j$(nproc --all) \
+ && make -j$(nproc --all) install \
  && cd /tmp \
  && rm -rf /tmp/CMake
 #endif
diff --git a/xenial-amd64-tcwg-base/Dockerfile b/xenial-amd64-tcwg-base/Dockerfile
index d427b339..1f0537e5 100644
--- a/xenial-amd64-tcwg-base/Dockerfile
+++ b/xenial-amd64-tcwg-base/Dockerfile
@@ -159,13 +159,12 @@ RUN apt-get update \
 
 
 # Install cmake v3.16 (same as in upcoming Ubuntu Focal images)
-# Don't build in parallel for the sake of armhf-01, which runs out of RAM
 RUN cd /tmp \
  && git clone -b v3.16.6 --single-branch --depth 1 https://github.com/Kitware/CMake.git \
  && cd /tmp/CMake \
- && ./bootstrap --parallel=1 \
- && make -j1 \
- && make -j1 install \
+ && ./bootstrap --parallel=$(nproc --all) \
+ && make -j$(nproc --all) \
+ && make -j$(nproc --all) install \
  && cd /tmp \
  && rm -rf /tmp/CMake
 
@@ -186,4 +185,4 @@ VOLUME /tmp
 
 EXPOSE 22
 CMD ["/usr/sbin/sshd", "-D"]
-# checksum: 53940d29239b35117e8fc3fb17d4d899
+# checksum: 4e22f52171f1c0531fff96cea87060ba
diff --git a/xenial-arm64-tcwg-base/Dockerfile b/xenial-arm64-tcwg-base/Dockerfile
index 275dd1d2..d0946808 100644
--- a/xenial-arm64-tcwg-base/Dockerfile
+++ b/xenial-arm64-tcwg-base/Dockerfile
@@ -139,13 +139,12 @@ RUN git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \
 
 
 # Install cmake v3.16 (same as in upcoming Ubuntu Focal images)
-# Don't build in parallel for the sake of armhf-01, which runs out of RAM
 RUN cd /tmp \
  && git clone -b v3.16.6 --single-branch --depth 1 https://github.com/Kitware/CMake.git \
  && cd /tmp/CMake \
- && ./bootstrap --parallel=1 \
- && make -j1 \
- && make -j1 install \
+ && ./bootstrap --parallel=$(nproc --all) \
+ && make -j$(nproc --all) \
+ && make -j$(nproc --all) install \
  && cd /tmp \
  && rm -rf /tmp/CMake
 
@@ -166,4 +165,4 @@ VOLUME /tmp
 
 EXPOSE 22
 CMD ["/usr/sbin/sshd", "-D"]
-# checksum: c5f392d58e492f657f18ac2fa311ed64
+# checksum: e188043101d26af5d3640b6add0bba70
diff --git a/xenial-armhf-tcwg-base/Dockerfile b/xenial-armhf-tcwg-base/Dockerfile
index 3c686eb5..f123d9f2 100644
--- a/xenial-armhf-tcwg-base/Dockerfile
+++ b/xenial-armhf-tcwg-base/Dockerfile
@@ -139,13 +139,12 @@ RUN git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \
 
 
 # Install cmake v3.16 (same as in upcoming Ubuntu Focal images)
-# Don't build in parallel for the sake of armhf-01, which runs out of RAM
 RUN cd /tmp \
  && git clone -b v3.16.6 --single-branch --depth 1 https://github.com/Kitware/CMake.git \
  && cd /tmp/CMake \
- && ./bootstrap --parallel=1 \
- && make -j1 \
- && make -j1 install \
+ && ./bootstrap --parallel=$(nproc --all) \
+ && make -j$(nproc --all) \
+ && make -j$(nproc --all) install \
  && cd /tmp \
  && rm -rf /tmp/CMake
 
@@ -166,4 +165,4 @@ VOLUME /tmp
 
 EXPOSE 22
 CMD ["linux32", "/usr/sbin/sshd", "-D"]
-# checksum: 637245ac514b5219335ffaa2545a01cb
+# checksum: 6043bcf1b8ef9eebefac72b1a6840941
diff --git a/xenial-i386-tcwg-base/Dockerfile b/xenial-i386-tcwg-base/Dockerfile
index beb5fd8e..3f16b690 100644
--- a/xenial-i386-tcwg-base/Dockerfile
+++ b/xenial-i386-tcwg-base/Dockerfile
@@ -144,13 +144,12 @@ RUN git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \
 
 
 # Install cmake v3.16 (same as in upcoming Ubuntu Focal images)
-# Don't build in parallel for the sake of armhf-01, which runs out of RAM
 RUN cd /tmp \
  && git clone -b v3.16.6 --single-branch --depth 1 https://github.com/Kitware/CMake.git \
  && cd /tmp/CMake \
- && ./bootstrap --parallel=1 \
- && make -j1 \
- && make -j1 install \
+ && ./bootstrap --parallel=$(nproc --all) \
+ && make -j$(nproc --all) \
+ && make -j$(nproc --all) install \
  && cd /tmp \
  && rm -rf /tmp/CMake
 
@@ -171,4 +170,4 @@ VOLUME /tmp
 
 EXPOSE 22
 CMD ["linux32", "/usr/sbin/sshd", "-D"]
-# checksum: 2c835a89704900e97a99036bd2c99e42
+# checksum: 12100f26a8276b8d51de1e3ee7e5a0ac