#2156: CI: make containers work for arm64/aarch64

DARMA-tasking · Jun 6, 2023 · 2927325 · 2927325
1 parent fa443d4
commit 2927325
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 7 deletions.
diff --git a/ci/deps/cmake.sh b/ci/deps/cmake.sh
@@ -4,12 +4,24 @@ set -exo pipefail
 
 if test $# -lt 1
 then
-    echo "usage: ./$0 <cmake-version>"
+    echo "usage: ./$0 <cmake-version> <arch>"
     exit 1
 fi
 
 cmake_version=$1
-cmake_tar_name=cmake-${cmake_version}-Linux-x86_64.tar.gz
+arch=x86_64
+
+if test $# -gt 1
+then
+    arch=$2
+fi
+
+if test "${arch}" = "arm64v8"
+then
+    arch=aarch64
+fi
+
+cmake_tar_name=cmake-${cmake_version}-linux-$arch.tar.gz
 
 echo "${cmake_version}"
 echo "${cmake_tar_name}"

diff --git a/ci/docker/ubuntu-20.04-gnu-openmpi-cpp.dockerfile b/ci/docker/ubuntu-20.04-gnu-openmpi-cpp.dockerfile
@@ -51,8 +51,10 @@ RUN if test ${zoltan_enabled} -eq 1; then \
 ENV CC=gcc \
     CXX=g++
 
+ARG arch
+
 COPY ./ci/deps/cmake.sh cmake.sh
-RUN ./cmake.sh 3.23.4
+RUN ./cmake.sh 3.23.4 ${arch}
 
 ENV PATH=/cmake/bin/:$PATH
 ENV LESSCHARSET=utf-8

diff --git a/ci/docker/ubuntu-clang-cpp.dockerfile b/ci/docker/ubuntu-clang-cpp.dockerfile
@@ -43,8 +43,10 @@ ENV CC=${compiler} \
 COPY ./ci/deps/libunwind.sh libunwind.sh
 RUN ./libunwind.sh 1.6.2
 
+ARG arch
+
 COPY ./ci/deps/cmake.sh cmake.sh
-RUN ./cmake.sh 3.23.4
+RUN ./cmake.sh 3.23.4 ${arch}
 
 ENV PATH=/cmake/bin/:$PATH
 ENV LESSCHARSET=utf-8

diff --git a/ci/docker/ubuntu-gnu-cpp.dockerfile b/ci/docker/ubuntu-gnu-cpp.dockerfile
@@ -56,8 +56,10 @@ RUN if test ${zoltan_enabled} -eq 1; then \
 ENV CC=gcc \
     CXX=g++
 
+ARG arch
+
 COPY ./ci/deps/cmake.sh cmake.sh
-RUN ./cmake.sh 3.23.4
+RUN ./cmake.sh 3.23.4 ${arch}
 
 ENV PATH=/cmake/bin/:$PATH
 ENV LESSCHARSET=utf-8

diff --git a/ci/docker/ubuntu-gnu-docs.dockerfile b/ci/docker/ubuntu-gnu-docs.dockerfile
@@ -38,8 +38,10 @@ ENV MPI_EXTRA_FLAGS="" \
     CXX=mpicxx \
     PATH=/usr/lib/ccache/:$PATH
 
+ARG arch
+
 COPY ./ci/deps/cmake.sh cmake.sh
-RUN ./cmake.sh 3.23.4
+RUN ./cmake.sh 3.23.4 ${arch}
 
 ENV PATH=/cmake/bin/:$PATH
 

diff --git a/ci/docker/ubuntu-nvidia-cpp.dockerfile b/ci/docker/ubuntu-nvidia-cpp.dockerfile
@@ -40,8 +40,10 @@ RUN apt-get update -y && \
 ENV CC=gcc \
     CXX=g++
 
+ARG arch
+
 COPY ./ci/deps/cmake.sh cmake.sh
-RUN ./cmake.sh 3.23.4
+RUN ./cmake.sh 3.23.4 ${arch}
 
 ENV PATH=/cmake/bin/:$PATH
 ENV LESSCHARSET=utf-8

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -95,6 +95,31 @@ volumes:
   amd64-alpine-icpc-icpc-cache:
   amd64-alpine-gcc-9-11.0.3-cache:
   amd64-alpine-gcc-9-11.2.0-cache:
+  arm64v8-ubuntu-18.04-clang-8-clang-8-cache:
+  arm64v8-ubuntu-18.04-clang-9-clang-9-cache:
+  arm64v8-ubuntu-20.04-clang-10-clang-10-cache:
+  arm64v8-ubuntu-22.04-clang-11-clang-11-cache:
+  arm64v8-ubuntu-18.04-gcc-8-gcc-8-cache:
+  arm64v8-ubuntu-20.04-gcc-9-gcc-9-cache:
+  arm64v8-ubuntu-20.04-gcc-10-gcc-10-cache:
+  arm64v8-ubuntu-22.04-gcc-12-gcc-12-cache:
+  arm64v8-ubuntu-18.04-icpx-icpx-cache:
+  arm64v8-ubuntu-18.04-icpc-icpc-cache:
+  arm64v8-ubuntu-20.04-gcc-9-11.0.3-cache:
+  arm64v8-ubuntu-20.04-gcc-9-11.2.0-cache:
+  arm64v8-alpine-clang-8-clang-8-cache:
+  arm64v8-alpine-clang-9-clang-9-cache:
+  arm64v8-alpine-clang-10-clang-10-cache:
+  arm64v8-alpine-clang-11-clang-11-cache:
+  arm64v8-alpine-clang-13-clang-13-cache:
+  arm64v8-alpine-gcc-8-gcc-8-cache:
+  arm64v8-alpine-gcc-9-gcc-9-cache:
+  arm64v8-alpine-gcc-10-gcc-10-cache:
+  arm64v8-alpine-gcc-12-gcc-12-cache:
+  arm64v8-alpine-icpx-icpx-cache:
+  arm64v8-alpine-icpc-icpc-cache:
+  arm64v8-alpine-gcc-9-11.0.3-cache:
+  arm64v8-alpine-gcc-9-11.2.0-cache:
 
 # Define basic rules for ccache used across multiple services. The beauty of
 # docker compose with cached volumes is that similarly configured builds will