From 1c485a289434aa4cb92d9f46b58e332cf3878884 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cezary=20Skrzy=C5=84ski?= Date: Thu, 20 Feb 2025 19:55:29 +0100 Subject: [PATCH] #2400: ci: use DARMA-tasking/workflows docker images --- docker-compose.yml | 141 ++++----------------------------------------- 1 file changed, 12 insertions(+), 129 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 660fbc796b..e0037a1184 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -126,23 +126,7 @@ services: # Ubuntu gcc-12 debug build: # docker compose run -e CMAKE_BUILD_TYPE=debug ubuntu-cpp ubuntu-cpp: - image: ${REPO}:${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-cpp - build: - context: . - target: base - dockerfile: ci/docker/ubuntu-${COMPILER_TYPE}-cpp.dockerfile - args: &default-args - arch: ${ARCH} - proxy: ${PROXY} - compiler: ${COMPILER} - host_compiler: ${HOST_COMPILER} - ubuntu: ${UBUNTU} - ubsan_enabled: ${VT_UBSAN:-0} - vt_tv_enabled: ${VT_TV_ENABLED:-0} - zoltan_enabled: ${VT_ZOLTAN:-0} - external_fmt: ${VT_EXTERNAL_FMT:-0} - cache_from: - - ${REPO}:${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-cpp + image: ${REPO}:wf-${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-cpp ulimits: &ulimits core: ${ULIMIT_CORE} environment: @@ -161,14 +145,7 @@ services: # Ubuntu gcc-12 debug build: # docker compose run -e CMAKE_BUILD_TYPE=debug ubuntu-vtk-cpp ubuntu-cpp-vtk: - image: ${REPO}:${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-vtk-cpp - build: - context: . - target: base - dockerfile: ci/docker/ubuntu-${COMPILER_TYPE}-vtk-cpp.dockerfile - args: *default-args - cache_from: - - ${REPO}:${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-vtk-cpp + image: ${REPO}:wf-${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-vtk-cpp ulimits: *ulimits environment: <<: [*ccache, *vtopts] @@ -182,14 +159,7 @@ services: # Example: # docker compose run ubuntu-cpp-clean ubuntu-cpp-clean: - image: ${REPO}:${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-cpp - build: - context: . - target: base - dockerfile: ci/docker/ubuntu-${COMPILER_TYPE}-cpp.dockerfile - args: *default-args - cache_from: - - ${REPO}:${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-cpp + image: ${REPO}:wf-${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-cpp ulimits: *ulimits environment: <<: [*ccache, *vtopts] @@ -208,14 +178,7 @@ services: # Example: # docker compose run ubuntu-cpp-clean-noinstall ubuntu-cpp-clean-noinstall: - image: ${REPO}:${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-cpp - build: - context: . - target: base - dockerfile: ci/docker/ubuntu-${COMPILER_TYPE}-cpp.dockerfile - args: *default-args - cache_from: - - ${REPO}:${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-cpp + image: ${REPO}:wf-${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-cpp ulimits: *ulimits environment: <<: [*ccache, *vtopts] @@ -237,14 +200,7 @@ services: # $ /vt/ci/test_cpp.sh /vt /build # $ /vt/ci/build_vt_sample.sh /vt /build ubuntu-cpp-interactive: - image: ${REPO}:${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-cpp - build: - context: . - target: base - dockerfile: ci/docker/ubuntu-${COMPILER_TYPE}-cpp.dockerfile - args: *default-args - cache_from: - - ${REPO}:${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-cpp + image: ${REPO}:wf-${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-cpp ulimits: *ulimits environment: <<: [*ccache, *vtopts] @@ -258,14 +214,7 @@ services: # modifying all the other container/image names to be parameterized over # MPI requires a lot of changes. ubuntu-cpp-clean-openmpi: - image: ${REPO}:${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-openmpi-cpp - build: - context: . - target: base - dockerfile: ci/docker/ubuntu-${UBUNTU}-${COMPILER_TYPE}-openmpi-cpp.dockerfile - args: *default-args - cache_from: - - ${REPO}:${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-openmpi-cpp + image: ${REPO}:wf-${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-openmpi-cpp ulimits: *ulimits environment: <<: [*ccache, *vtopts] @@ -277,55 +226,18 @@ services: # Interactive C++ setup of VT on ubuntu platform from container baseline for # OpenMPI. ubuntu-cpp-interactive-openmpi: - image: ${REPO}:${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-openmpi-cpp - build: - context: . - target: base - dockerfile: ci/docker/ubuntu-${UBUNTU}-${COMPILER_TYPE}-openmpi-cpp.dockerfile - args: *default-args - cache_from: - - ${REPO}:${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-openmpi-cpp + image: ${REPO}:wf-${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-openmpi-cpp ulimits: *ulimits environment: <<: [*ccache, *vtopts] OMPI_MCA_btl: "^vader" volumes: *ubuntu-volumes - ############################################################################## - # Build C++ container with VT installed in the container on ubuntu platform - # from container baseline. - ubuntu-vt: - image: ${REPO}:vt-${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-cpp - build: - context: . - target: build - dockerfile: ci/docker/ubuntu-${COMPILER_TYPE}-cpp.dockerfile - args: - <<: [*default-args, *vtopts] - cache_from: - - ${REPO}:${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-cpp - ulimits: *ulimits - environment: - <<: [*ccache, *vtopts] - volumes: *ubuntu-volumes - command: &cpp-command > - /bin/bash -c " - /vt/ci/test_cpp.sh /vt /build" - ############################################################################## # Build documentation for VT in the container on ubuntu platform from # container baseline. ubuntu-docs: - image: ${REPO}:${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-docs - build: - context: . - target: base - dockerfile: ci/docker/ubuntu-${COMPILER_TYPE}-docs.dockerfile - args: - <<: *default-args - token: ${TOKEN} - cache_from: - - ${REPO}:${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-cpp + image: ${REPO}:wf-${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER} ulimits: *ulimits environment: <<: *ccache @@ -342,14 +254,7 @@ services: ############################################################################## # Build vt sample project using DARMA-vt installed from spack package. ubuntu-spack: - image: ${REPO}:${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-openmpi-cpp - build: - context: . - target: base - dockerfile: ci/docker/ubuntu-${UBUNTU}-${COMPILER_TYPE}-openmpi-cpp.dockerfile - args: *default-args - cache_from: - - ${REPO}:${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-openmpi-cpp + image: ${REPO}:wf-${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-openmpi-cpp ulimits: *ulimits environment: <<: *vtopts @@ -362,15 +267,7 @@ services: # Interactive build documentation for VT in the container on ubuntu platform # from container baseline. ubuntu-docs-interactive: - image: ${REPO}:${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-docs - build: - context: . - target: base - dockerfile: ci/docker/ubuntu-${UBUNTU}-${COMPILER_TYPE}-docs.dockerfile - args: - <<: *default-args - cache_from: - - ${REPO}:${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-cpp + image: ${REPO}:wf-${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER} ulimits: *ulimits environment: <<: *ccache @@ -385,14 +282,7 @@ services: # C++ build of VT within an alpine linux container (limited to clang # compilers) alpine-cpp: - image: ${REPO}:${ARCH}-alpine-${HOST_COMPILER}-${COMPILER}-cpp - build: - context: . - target: base - dockerfile: ci/docker/alpine-cpp.dockerfile - args: *default-args - cache_from: - - ${REPO}:${ARCH}-alpine-${HOST_COMPILER}-${COMPILER}-cpp + image: ${REPO}:wf-${ARCH}-alpine-${HOST_COMPILER}-${COMPILER}-cpp ulimits: *ulimits environment: <<: [*ccache, *vtopts] @@ -405,14 +295,7 @@ services: # C++ build/test/clean target for VT on alpine platform from container # baseline. alpine-cpp-clean: - image: ${REPO}:${ARCH}-alpine-${HOST_COMPILER}-${COMPILER}-cpp - build: - context: . - target: base - dockerfile: ci/docker/alpine-cpp.dockerfile - args: *default-args - cache_from: - - ${REPO}:${ARCH}-alpine-${HOST_COMPILER}-${COMPILER}-cpp + image: ${REPO}:wf-${ARCH}-alpine-${HOST_COMPILER}-${COMPILER}-cpp ulimits: *ulimits environment: <<: [*ccache, *vtopts]