From 25ffbcde87a5ad05eac1434fb7ae5fce502d482c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cezary=20Skrzy=C5=84ski?= Date: Thu, 20 Feb 2025 19:45:41 +0100 Subject: [PATCH 1/2] #2400: ci: remove obsolete files --- .github/workflows/pushdockerimage.yml | 27 ----- ci/deps/cmake.sh | 36 ------ ci/deps/doxygen.sh | 18 --- ci/deps/mpich.sh | 39 ------- ci/docker/alpine-cpp.dockerfile | 58 ---------- .../ubuntu-20.04-gnu-openmpi-cpp.dockerfile | 86 -------------- ci/docker/ubuntu-clang-cpp.dockerfile | 75 ------------ ci/docker/ubuntu-gnu-cpp.dockerfile | 102 ----------------- ci/docker/ubuntu-gnu-docs.dockerfile | 58 ---------- ci/docker/ubuntu-gnu-vtk-cpp.dockerfile | 108 ------------------ ci/docker/ubuntu-intel-oneapi-cpp.dockerfile | 67 ----------- ci/docker/ubuntu-nvidia-cpp.dockerfile | 78 ------------- 12 files changed, 752 deletions(-) delete mode 100644 .github/workflows/pushdockerimage.yml delete mode 100755 ci/deps/cmake.sh delete mode 100755 ci/deps/doxygen.sh delete mode 100755 ci/deps/mpich.sh delete mode 100644 ci/docker/alpine-cpp.dockerfile delete mode 100644 ci/docker/ubuntu-20.04-gnu-openmpi-cpp.dockerfile delete mode 100644 ci/docker/ubuntu-clang-cpp.dockerfile delete mode 100644 ci/docker/ubuntu-gnu-cpp.dockerfile delete mode 100644 ci/docker/ubuntu-gnu-docs.dockerfile delete mode 100644 ci/docker/ubuntu-gnu-vtk-cpp.dockerfile delete mode 100644 ci/docker/ubuntu-intel-oneapi-cpp.dockerfile delete mode 100644 ci/docker/ubuntu-nvidia-cpp.dockerfile diff --git a/.github/workflows/pushdockerimage.yml b/.github/workflows/pushdockerimage.yml deleted file mode 100644 index ffe988e457..0000000000 --- a/.github/workflows/pushdockerimage.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: Docker Image CI - -on: - push: - branches: - - develop - -jobs: - - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v4 - - name: Docker Build & Push - uses: jerray/publish-docker-action@master - with: - # Name of the Docker image - repository: lifflander1/vt - # Target Docker registry - registry: docker.io - auto_tag: true - # Docker registry username - username: ${{ secrets.DOCKER_USERNAME }} - # Docker registry password - password: ${{ secrets.DOCKER_PASSWORD }} diff --git a/ci/deps/cmake.sh b/ci/deps/cmake.sh deleted file mode 100755 index a7a173de2b..0000000000 --- a/ci/deps/cmake.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env bash - -set -exo pipefail - -if test $# -lt 1 -then - echo "usage: ./$0 " - exit 1 -fi - -cmake_version=$1 -arch=x86_64 - -if test $# -gt 1 -then - arch=$2 -fi - -if test "${arch}" = "arm64v8" -then - arch=aarch64 -fi - -if test "${arch}" = "amd64" -then - arch=x86_64 -fi - -cmake_tar_name=cmake-${cmake_version}-linux-$arch.tar.gz - -echo "${cmake_version}" -echo "${cmake_tar_name}" - -wget http://github.com/Kitware/CMake/releases/download/v${cmake_version}/${cmake_tar_name} - -tar xzf ${cmake_tar_name} --one-top-level=cmake --strip-components 1 diff --git a/ci/deps/doxygen.sh b/ci/deps/doxygen.sh deleted file mode 100755 index eff7a54f36..0000000000 --- a/ci/deps/doxygen.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env bash - -set -exo pipefail - -if test $# -ne 1 -then - echo "usage: ./$0 " - exit 1 -fi - -doxygen_version=$1 -doxygen_tar_name=doxygen-"${doxygen_version}".linux.bin.tar.gz - -echo "${doxygen_tar_name}" - -wget https://sourceforge.net/projects/doxygen/files/rel-"${doxygen_version}"/"${doxygen_tar_name}" - -tar xzf "${doxygen_tar_name}" --one-top-level=doxygen --strip-components=1 diff --git a/ci/deps/mpich.sh b/ci/deps/mpich.sh deleted file mode 100755 index 64163c0cf4..0000000000 --- a/ci/deps/mpich.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env bash - -set -exo pipefail - -if test $# -lt 2 -then - echo "usage: ./$0 " - exit 1 -fi - -mpich_version=$1 -mpich_name="mpich-${mpich_version}" -mpich_tar_name="${mpich_name}.tar.gz" -make_flags="$2" -installation_prefix="${3-}" - -echo "${mpich_version}" -echo "${mpich_name}" -echo "${mpich_tar_name}" -echo "${make_flags}" - -wget http://www.mpich.org/static/downloads/${mpich_version}/${mpich_tar_name} -tar xzf ${mpich_tar_name} -rm ${mpich_tar_name} -cd ${mpich_name} -./configure \ - --enable-static=false \ - --enable-alloca=true \ - --disable-long-double \ - --enable-threads=single \ - --enable-fortran=no \ - --enable-fast=all \ - --enable-g=none \ - --enable-timing=none \ - ${installation_prefix:+ --prefix"=${installation_prefix}"} -make ${make_flags} -make install -cd - -rm -rf ${mpich_name} diff --git a/ci/docker/alpine-cpp.dockerfile b/ci/docker/alpine-cpp.dockerfile deleted file mode 100644 index 9d11003e48..0000000000 --- a/ci/docker/alpine-cpp.dockerfile +++ /dev/null @@ -1,58 +0,0 @@ - -ARG arch=amd64 -FROM alpine:3.16 AS base - -ARG proxy="" - -ENV https_proxy=${proxy} \ - http_proxy=${proxy} - -RUN apk add --no-cache \ - alpine-sdk \ - autoconf \ - automake \ - bash \ - binutils-dev \ - ccache \ - clang \ - clang-dev \ - cmake \ - dpkg \ - libdwarf-dev \ - libunwind-dev \ - libtool \ - linux-headers \ - m4 \ - make \ - ninja \ - wget \ - zlib \ - zlib-dev - -RUN ln -sf /usr/bin/clang /usr/bin/cc && \ - ln -sf /usr/bin/clang++ /usr/bin/c++ && \ - update-alternatives --install /usr/bin/cc cc /usr/bin/clang 10 && \ - update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++ 10 && \ - update-alternatives --auto cc && \ - update-alternatives --auto c++ && \ - update-alternatives --display cc && \ - update-alternatives --display c++ && \ - cc --version && \ - c++ --version - -ENV CC=clang \ - CXX=clang++ - -COPY ./ci/deps/mpich.sh mpich.sh -RUN ./mpich.sh 3.3.2 -j4 - -ENV CC=mpicc \ - CXX=mpicxx \ - PATH=/usr/lib/ccache/:$PATH - -FROM base AS build -COPY . /vt -RUN /vt/ci/build_cpp.sh /vt /build - -FROM build AS test -RUN /vt/ci/test_cpp.sh /vt /build diff --git a/ci/docker/ubuntu-20.04-gnu-openmpi-cpp.dockerfile b/ci/docker/ubuntu-20.04-gnu-openmpi-cpp.dockerfile deleted file mode 100644 index 543eeabc60..0000000000 --- a/ci/docker/ubuntu-20.04-gnu-openmpi-cpp.dockerfile +++ /dev/null @@ -1,86 +0,0 @@ - -ARG arch=amd64 -FROM ${arch}/ubuntu:20.04 as base - -ARG proxy="" -ARG compiler=gcc-9 - -ENV https_proxy=${proxy} \ - http_proxy=${proxy} - -ENV DEBIAN_FRONTEND=noninteractive - -ARG zoltan_enabled - -RUN apt-get update -y -q && \ - apt-get install -y -q --no-install-recommends \ - g++-$(echo ${compiler} | cut -d- -f2) \ - ca-certificates \ - less \ - curl \ - ${zoltan_enabled:+gfortran-$(echo ${compiler} | cut -d- -f2)} \ - git \ - wget \ - ${compiler} \ - zlib1g \ - zlib1g-dev \ - ninja-build \ - valgrind \ - make-guile \ - libomp5 \ - ccache \ - python3 \ - ssh && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -RUN ln -s \ - "$(which g++-$(echo ${compiler} | cut -d- -f2))" \ - /usr/bin/g++ - -RUN ln -s \ - "$(which gcc-$(echo ${compiler} | cut -d- -f2))" \ - /usr/bin/gcc - -RUN if test ${zoltan_enabled} -eq 1; then \ - ln -s \ - "$(which gfortran-$(echo ${compiler} | cut -d- -f2))" \ - /usr/bin/gfortran; \ - fi - -ENV CC=gcc \ - CXX=g++ - -ARG arch - -COPY ./ci/deps/cmake.sh cmake.sh -RUN ./cmake.sh 3.23.4 ${arch} - -ENV PATH=/cmake/bin/:$PATH -ENV LESSCHARSET=utf-8 - -COPY ./ci/deps/openmpi.sh openmpi.sh -RUN ./openmpi.sh v4.0 4.0.4 -j4 - -ENV MPI_EXTRA_FLAGS="--allow-run-as-root --oversubscribe" \ - PATH=/usr/lib/ccache/:$PATH - -ARG ZOLTAN_INSTALL_DIR=/trilinos-install -ENV ZOLTAN_DIR=${ZOLTAN_INSTALL_DIR} - -COPY ./ci/deps/zoltan.sh zoltan.sh -RUN if test ${zoltan_enabled} -eq 1; then \ - ./zoltan.sh -j4 ${ZOLTAN_INSTALL_DIR}; \ - fi - -ENV OMPI_ALLOW_RUN_AS_ROOT=1 \ - OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1 - -FROM base as build -COPY . /vt -RUN /vt/ci/build_cpp.sh /vt /build - -FROM build as test -RUN /vt/ci/test_cpp.sh /vt /build - -RUN /vt/ci/build_vt_sample.sh /vt /build diff --git a/ci/docker/ubuntu-clang-cpp.dockerfile b/ci/docker/ubuntu-clang-cpp.dockerfile deleted file mode 100644 index d6eb39f07f..0000000000 --- a/ci/docker/ubuntu-clang-cpp.dockerfile +++ /dev/null @@ -1,75 +0,0 @@ -ARG arch=amd64 -ARG ubuntu=20.04 -FROM ${arch}/ubuntu:${ubuntu} AS base - -ARG proxy="" -ARG compiler=clang-11 -ARG ubsan_enabled -ARG ubuntu - -ENV https_proxy=${proxy} \ - http_proxy=${proxy} - -ENV DEBIAN_FRONTEND=noninteractive - -RUN apt-get update -y -q && \ - apt-get install -y -q --no-install-recommends \ - ${compiler} \ - ${ubsan_enabled:+llvm-$(echo ${compiler} | cut -d- -f2)} \ - brotli \ - ca-certificates \ - linux-tools-generic \ - ccache \ - curl \ - git \ - less \ - libomp-dev \ - libomp5 \ - make-guile \ - ninja-build \ - python3 \ - python3-brotli \ - python3-deepdiff \ - python3-pip \ - python3-schema \ - valgrind \ - wget \ - zlib1g \ - zlib1g-dev && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -RUN ln -s \ - "$(which $(echo ${compiler} | cut -d- -f1)++-$(echo ${compiler} | cut -d- -f2))" \ - /usr/bin/clang++ - -ENV CC=${compiler} \ - CXX=clang++ - -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 ${arch} - -ENV PATH=/cmake/bin/:$PATH -ENV LESSCHARSET=utf-8 - -COPY ./ci/deps/mpich.sh mpich.sh -RUN ./mpich.sh 4.0.2 -j4 - -ENV MPI_EXTRA_FLAGS="" \ - CMAKE_PREFIX_PATH="/lib/x86_64-linux-gnu/" \ - PATH=/usr/lib/ccache/:$PATH \ - CMAKE_EXE_LINKER_FLAGS="-pthread" - -FROM base as build -COPY . /vt -RUN /vt/ci/build_cpp.sh /vt /build - -FROM build AS test -RUN /vt/ci/test_cpp.sh /vt /build - -RUN /vt/ci/build_vt_sample.sh /vt /build diff --git a/ci/docker/ubuntu-gnu-cpp.dockerfile b/ci/docker/ubuntu-gnu-cpp.dockerfile deleted file mode 100644 index 150e291218..0000000000 --- a/ci/docker/ubuntu-gnu-cpp.dockerfile +++ /dev/null @@ -1,102 +0,0 @@ -ARG arch=amd64 -ARG ubuntu=20.04 -FROM ${arch}/ubuntu:${ubuntu} AS base - -ARG proxy="" -ARG compiler=gcc-9 -ARG ubuntu - -ENV https_proxy=${proxy} \ - http_proxy=${proxy} - -ENV DEBIAN_FRONTEND=noninteractive - -ARG zoltan_enabled - -RUN apt-get update -y -q && \ - apt-get install -y -q --no-install-recommends \ - ${compiler} \ - g++-$(echo ${compiler} | cut -d- -f2) \ - ${zoltan_enabled:+gfortran-$(echo ${compiler} | cut -d- -f2)} \ - brotli \ - ca-certificates \ - linux-tools-generic \ - ccache \ - curl \ - git \ - less \ - libgl1-mesa-dev \ - libglu1-mesa-dev \ - libncurses5-dev \ - libomp5 \ - libunwind-dev \ - m4 \ - make-guile \ - mesa-common-dev \ - ninja-build \ - python3 \ - python3-brotli \ - python3-deepdiff \ - python3-numpy \ - python3-pip \ - python3-schema \ - valgrind \ - wget \ - zlib1g \ - zlib1g-dev && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -RUN ln -s \ - "$(which g++-$(echo ${compiler} | cut -d- -f2))" \ - /usr/bin/g++ - -RUN ln -s \ - "$(which gcc-$(echo ${compiler} | cut -d- -f2))" \ - /usr/bin/gcc - -RUN if test ${zoltan_enabled} -eq 1; then \ - ln -s \ - "$(which gfortran-$(echo ${compiler} | cut -d- -f2))" \ - /usr/bin/gfortran; \ - fi - -ENV CC=gcc \ - CXX=g++ - -ARG arch - -COPY ./ci/deps/cmake.sh cmake.sh -RUN ./cmake.sh 3.23.4 ${arch} - -ENV PATH=/cmake/bin/:$PATH -ENV LESSCHARSET=utf-8 - -COPY ./ci/deps/mpich.sh mpich.sh -RUN ./mpich.sh 4.0.2 -j4 - -ENV MPI_EXTRA_FLAGS="" \ - PATH=/usr/lib/ccache/:$PATH - -ARG ZOLTAN_INSTALL_DIR=/trilinos-install -ENV ZOLTAN_DIR=${ZOLTAN_INSTALL_DIR} - -COPY ./ci/deps/zoltan.sh zoltan.sh -RUN if test ${zoltan_enabled} -eq 1; then \ - ./zoltan.sh -j4 ${ZOLTAN_INSTALL_DIR}; \ - fi - -RUN apt-get update -y -q && \ - apt-get install -y -q --no-install-recommends \ - lcov && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -FROM base as build -COPY . /vt -RUN /vt/ci/build_cpp.sh /vt /build - -FROM build AS test -RUN /vt/ci/test_cpp.sh /vt /build - -RUN /vt/ci/build_vt_sample.sh /vt /build diff --git a/ci/docker/ubuntu-gnu-docs.dockerfile b/ci/docker/ubuntu-gnu-docs.dockerfile deleted file mode 100644 index 803ef13990..0000000000 --- a/ci/docker/ubuntu-gnu-docs.dockerfile +++ /dev/null @@ -1,58 +0,0 @@ -ARG arch=amd64 -ARG ubuntu=22.04 -FROM ${arch}/ubuntu:${ubuntu} as base - -ARG proxy="" -ARG compiler=gcc-9 -ARG token - -ENV https_proxy=${proxy} \ - http_proxy=${proxy} - -ENV DEBIAN_FRONTEND=noninteractive - -RUN apt-get update -y -q && \ - apt-get install -y -q --no-install-recommends \ - ${compiler} \ - ca-certificates \ - ccache \ - curl \ - ghostscript \ - git \ - libmpich-dev \ - mpich \ - ninja-build \ - python3 \ - python3-jinja2 \ - python3-pygments \ - texlive-font-utils \ - wget \ - zlib1g \ - zlib1g-dev &&\ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -ENV MPI_EXTRA_FLAGS="" \ - CMAKE_PREFIX_PATH="/lib/x86_64-linux-gnu/" \ - CC=mpicc \ - CXX=mpicxx \ - PATH=/usr/lib/ccache/:$PATH - -ARG arch - -COPY ./ci/deps/cmake.sh cmake.sh -RUN ./cmake.sh 3.23.4 ${arch} - -ENV PATH=/cmake/bin/:$PATH - -COPY ./ci/deps/doxygen.sh doxygen.sh -RUN ./doxygen.sh 1.8.16 - -ENV PATH=/doxygen/bin/:$PATH - -FROM base as build -COPY . /vt - -ARG token - -RUN /vt/ci/build_cpp.sh /vt /build "${token}" diff --git a/ci/docker/ubuntu-gnu-vtk-cpp.dockerfile b/ci/docker/ubuntu-gnu-vtk-cpp.dockerfile deleted file mode 100644 index cc6f46c38b..0000000000 --- a/ci/docker/ubuntu-gnu-vtk-cpp.dockerfile +++ /dev/null @@ -1,108 +0,0 @@ -ARG arch=amd64 -ARG ubuntu=20.04 -FROM ${arch}/ubuntu:${ubuntu} as base - -ARG proxy="" -ARG compiler=gcc-12 -ARG ubuntu - -ENV https_proxy=${proxy} \ - http_proxy=${proxy} - -ENV DEBIAN_FRONTEND=noninteractive - -ARG zoltan_enabled - -RUN apt-get update -y -q && \ - apt-get install -y -q --no-install-recommends \ - ${compiler} \ - g++-$(echo ${compiler} | cut -d- -f2) \ - ${zoltan_enabled:+gfortran-$(echo ${compiler} | cut -d- -f2)} \ - ca-certificates \ - ccache \ - curl \ - git \ - less \ - libomp5 \ - libunwind-dev \ - make-guile \ - ninja-build \ - python3 \ - valgrind \ - wget \ - zlib1g \ - zlib1g-dev \ - libncurses5-dev \ - m4 \ - libgl1-mesa-dev \ - libglu1-mesa-dev \ - mesa-common-dev \ - brotli \ - python3 \ - python3-brotli \ - python3-pip && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -RUN ln -s \ - "$(which g++-$(echo ${compiler} | cut -d- -f2))" \ - /usr/bin/g++ - -RUN ln -s \ - "$(which gcc-$(echo ${compiler} | cut -d- -f2))" \ - /usr/bin/gcc - -RUN if test ${zoltan_enabled} -eq 1; then \ - ln -s \ - "$(which gfortran-$(echo ${compiler} | cut -d- -f2))" \ - /usr/bin/gfortran; \ - fi - -ENV CC=gcc \ - CXX=g++ - -ARG arch - -COPY ./ci/deps/cmake.sh cmake.sh -RUN ./cmake.sh 3.23.4 ${arch} - -ENV PATH=/cmake/bin/:$PATH -ENV LESSCHARSET=utf-8 - -COPY ./ci/deps/vtk.sh vtk.sh -RUN chmod +x vtk.sh && ./vtk.sh 9.3.0 /vtk-build -j4 -ENV VTK_DIR=/vtk-build/install/lib/cmake/vtk-9.3 - -COPY ./ci/deps/mpich.sh mpich.sh -RUN if [ "$ubuntu" = "18.04" ]; then \ - ./mpich.sh 3.3.2 -j4; else \ - ./mpich.sh 4.0.2 -j4; \ - fi - -ENV MPI_EXTRA_FLAGS="" \ - PATH=/usr/lib/ccache/:$PATH - -ARG ZOLTAN_INSTALL_DIR=/trilinos-install -ENV ZOLTAN_DIR=${ZOLTAN_INSTALL_DIR} - -COPY ./ci/deps/zoltan.sh zoltan.sh -RUN if test ${zoltan_enabled} -eq 1; then \ - ./zoltan.sh -j4 ${ZOLTAN_INSTALL_DIR}; \ - fi - -RUN apt-get update -y -q && \ - apt-get install -y -q --no-install-recommends \ - lcov && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -RUN pip3 install schema - -FROM base as build -COPY . /vt -RUN /vt/ci/build_cpp.sh /vt /build - -FROM build as test -RUN /vt/ci/test_cpp.sh /vt /build - -RUN /vt/ci/build_vt_sample.sh /vt /build diff --git a/ci/docker/ubuntu-intel-oneapi-cpp.dockerfile b/ci/docker/ubuntu-intel-oneapi-cpp.dockerfile deleted file mode 100644 index f777abefde..0000000000 --- a/ci/docker/ubuntu-intel-oneapi-cpp.dockerfile +++ /dev/null @@ -1,67 +0,0 @@ - -FROM intel/oneapi:os-tools-ubuntu20.04 as base - -ARG proxy="" -ARG compiler=icpx - -ENV https_proxy=${proxy} \ - http_proxy=${proxy} - -ENV DEBIAN_FRONTEND=noninteractive - -RUN apt-get update -y -q && \ - apt-get install -y -q --no-install-recommends \ - intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic-2022.2.1 \ - ca-certificates \ - less \ - curl \ - git \ - wget \ - zlib1g \ - zlib1g-dev \ - ninja-build \ - valgrind \ - make-guile \ - libomp5 \ - libunwind-dev \ - ccache && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -ENV CMAKE_PREFIX_PATH='/opt/intel/oneapi/tbb/latest/env/..' \ - CMPLR_ROOT=/opt/intel/oneapi/compiler/latest \ - CPATH='/opt/intel/oneapi/tbb/latest/env/../include:/opt/intel/oneapi/dev-utilities/latest/include:/opt/intel/oneapi/compiler/latest/linux/include' \ - INFOPATH=/opt/intel/oneapi/debugger/10.1.2/gdb/intel64/lib \ - INTEL_LICENSE_FILE='/opt/intel/licenses:/root/intel/licenses:/opt/intel/licenses:/root/intel/licenses:/Users/Shared/Library/Application Support/Intel/Licenses' \ - LD_LIBRARY_PATH='/opt/intel/oneapi/tbb/latest/env/../lib/intel64/gcc4.8:/opt/intel/oneapi/debugger/10.1.1/dep/lib:/opt/intel/oneapi/debugger/10.1.1/libipt/intel64/lib:/opt/intel/oneapi/debugger/10.1.1/gdb/intel64/lib:/opt/intel/oneapi/compiler/latest/linux/lib:/opt/intel/oneapi/compiler/latest/linux/lib/x64:/opt/intel/oneapi/compiler/latest/linux/lib/emu:/opt/intel/oneapi/compiler/latest/linux/lib/oclfpga/host/linux64/lib:/opt/intel/oneapi/compiler/latest/linux/lib/oclfpga/linux64/lib:/opt/intel/oneapi/compiler/latest/linux/compiler/lib/intel64_lin:/opt/intel/oneapi/compiler/latest/linux/compiler/lib' \ - LIBRARY_PATH='/opt/intel/oneapi/tbb/latest/env/../lib/intel64/gcc4.8:/opt/intel/oneapi/compiler/latest/linux/compiler/lib/intel64_lin:/opt/intel/oneapi/compiler/latest/linux/lib' \ - ONEAPI_ROOT='/opt/intel/oneapi' \ - PATH='/opt/intel/oneapi/dev-utilities/latest/bin:/opt/intel/oneapi/debugger/10.1.1/gdb/intel64/bin:/opt/intel/oneapi/compiler/latest/linux/lib/oclfpga/llvm/aocl-bin:/opt/intel/oneapi/compiler/latest/linux/lib/oclfpga/bin:/opt/intel/oneapi/compiler/latest/linux/bin/intel64:/opt/intel/oneapi/compiler/latest/linux/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' \ - TBBROOT='/opt/intel/oneapi/tbb/latest/env/..' - -RUN ln -s \ - "$(which $(echo $compiler | sed 's/p//'))" \ - /usr/bin/intel-cc - -ENV CC=intel-cc \ - CXX=${compiler} - -COPY ./ci/deps/mpich.sh mpich.sh -RUN ./mpich.sh 4.0.2 -j4 - -ENV CC=mpicc \ - CXX=mpicxx \ - MPICH_CC=intel-cc \ - MPICH_CXX=${compiler} \ - MPI_EXTRA_FLAGS="" \ - LESSCHARSET=utf-8 \ - PATH=/usr/lib/ccache/:$PATH - -FROM base as build -COPY . /vt -RUN /vt/ci/build_cpp.sh /vt /build - -FROM build as test -RUN /vt/ci/test_cpp.sh /vt /build - -RUN /vt/ci/build_vt_sample.sh /vt /build diff --git a/ci/docker/ubuntu-nvidia-cpp.dockerfile b/ci/docker/ubuntu-nvidia-cpp.dockerfile deleted file mode 100644 index b2ecce38a6..0000000000 --- a/ci/docker/ubuntu-nvidia-cpp.dockerfile +++ /dev/null @@ -1,78 +0,0 @@ - -ARG compiler=11.0.3 -ARG arch=amd64 -# Works with 20.04 and 22.04 -ARG ubuntu=20.04 -FROM --platform=${arch} nvidia/cuda:${compiler}-devel-ubuntu${ubuntu} as base - -ARG host_compiler=gcc-9 -ARG proxy="" - -ENV https_proxy=${proxy} \ - http_proxy=${proxy} - -ENV DEBIAN_FRONTEND=noninteractive - -RUN apt-get update -y && \ - apt-get install -y software-properties-common --no-install-recommends && \ - add-apt-repository -y ppa:ubuntu-toolchain-r/test && \ - apt remove -y software-properties-common && \ - apt-get install -y --no-install-recommends \ - ca-certificates \ - g++-$(echo ${host_compiler} | cut -d- -f2) \ - curl \ - less \ - git \ - wget \ - zlib1g \ - zlib1g-dev \ - ninja-build \ - gnupg \ - make-guile \ - libomp5 \ - libunwind-dev \ - valgrind \ - ccache && \ - apt-get autoremove -y && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -ENV CC=gcc \ - CXX=g++ - -ARG arch - -COPY ./ci/deps/cmake.sh cmake.sh -RUN ./cmake.sh 3.23.4 ${arch} - -ENV PATH=/cmake/bin/:$PATH -ENV LESSCHARSET=utf-8 - -COPY ./ci/deps/mpich.sh mpich.sh -RUN ./mpich.sh 3.3.2 -j4 - -ARG external_fmt -COPY ./ci/deps/fmt.sh fmt.sh - -RUN if test ${external_fmt} -eq 1; then \ - chmod +x ./fmt.sh && \ - ./fmt.sh 7.1.3 -j4; \ - fi - -RUN mkdir -p /nvcc_wrapper/build && \ - wget https://raw.githubusercontent.com/kokkos/kokkos/master/bin/nvcc_wrapper -P /nvcc_wrapper/build && \ - chmod +x /nvcc_wrapper/build/nvcc_wrapper - -ENV MPI_EXTRA_FLAGS="" \ - HOST_COMPILER=${host_compiler} \ - PATH=/usr/lib/ccache/:/nvcc_wrapper/build:$PATH \ - CXX=nvcc_wrapper - -FROM base as build -COPY . /vt -RUN /vt/ci/build_cpp.sh /vt /build - -FROM build as test -RUN /vt/ci/test_cpp.sh /vt /build - -RUN /vt/ci/build_vt_sample.sh /vt /build From 4e82da6c59b84878593d533987fa07783d261927 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 2/2] #2400: ci: use DARMA-tasking/workflows docker images --- ci/azure/azure-clang-10-ubuntu-mpich.yml | 23 +-- ci/azure/azure-clang-11-ubuntu-mpich.yml | 23 +-- ci/azure/azure-clang-12-ubuntu-mpich.yml | 23 +-- ci/azure/azure-clang-13-ubuntu-mpich.yml | 23 +-- ci/azure/azure-clang-14-ubuntu-mpich.yml | 23 +-- ci/azure/azure-clang-16-ubuntu-mpich.yml | 23 +-- ci/azure/azure-clang-17-ubuntu-mpich-perf.yml | 23 +-- ci/azure/azure-clang-9-ubuntu-mpich.yml | 23 +-- ci/azure/azure-clang-alpine-mpich.yml | 23 +-- .../azure-gcc-10-ubuntu-openmpi-spack.yml | 23 +-- ci/azure/azure-gcc-10-ubuntu-openmpi.yml | 23 +-- ci/azure/azure-gcc-11-ubuntu-mpich.yml | 23 +-- ci/azure/azure-gcc-12-ubuntu-mpich.yml | 23 +-- ci/azure/azure-gcc-12-ubuntu-vttv.yml | 23 +-- ci/azure/azure-gcc-13-ubuntu-mpich.yml | 23 +-- ci/azure/azure-gcc-14-ubuntu-perf.yml | 23 +-- ci/azure/azure-gcc-9-ubuntu-mpich.yml | 23 +-- .../azure-intel-oneapi-icpc-ubuntu-mpich.yml | 23 +-- .../azure-intel-oneapi-icpx-ubuntu-mpich.yml | 23 +-- ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml | 23 +-- ci/azure/azure-nvidia-12-ubuntu-mpich.yml | 23 +-- docker-compose.yml | 145 ++---------------- scripts/workflow-azure-template.yml | 23 +-- 23 files changed, 58 insertions(+), 593 deletions(-) diff --git a/ci/azure/azure-clang-10-ubuntu-mpich.yml b/ci/azure/azure-clang-10-ubuntu-mpich.yml index 64721b4d3f..27291decc6 100644 --- a/ci/azure/azure-clang-10-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-10-ubuntu-mpich.yml @@ -127,14 +127,6 @@ stages: $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) $(Agent.OS) | "$(cache_name)" - - task: Bash@3 - displayName: Check for changes in containers - condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') - inputs: - targetType: 'inline' - script: | - val=$(./scripts/check_containers.sh) - echo "##vso[task.setvariable variable=compose_command]$val" - task: DockerCompose@1 displayName: Pull container inputs: @@ -142,9 +134,9 @@ stages: containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' - dockerComposeCommand: '$(compose_command) ubuntu-cpp-clean' + dockerComposeCommand: 'pull ubuntu-cpp-clean' - task: DockerCompose@1 - displayName: Build container + displayName: Build and Test inputs: projectName: darma-tasking-vt containerregistrytype: 'Container Registry' @@ -172,17 +164,6 @@ stages: "$(Agent.JobStatus)" env: GITHUB_PAT: $(github_pat) - - task: DockerCompose@1 - displayName: Push container to registry - continueOnError: true - condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) - inputs: - projectName: darma-tasking-vt - containerregistrytype: 'Container Registry' - dockerRegistryEndpoint: 'dockerRegistryConnection1' - dockerComposeFile: '**/docker-compose.yml' - action: 'Run a Docker Compose command' - dockerComposeCommand: 'push ubuntu-cpp-clean' - task: Bash@3 displayName: Create artifacts continueOnError: true diff --git a/ci/azure/azure-clang-11-ubuntu-mpich.yml b/ci/azure/azure-clang-11-ubuntu-mpich.yml index 62584c467e..43ce0426e2 100644 --- a/ci/azure/azure-clang-11-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-11-ubuntu-mpich.yml @@ -127,14 +127,6 @@ stages: $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) $(Agent.OS) | "$(cache_name)" - - task: Bash@3 - displayName: Check for changes in containers - condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') - inputs: - targetType: 'inline' - script: | - val=$(./scripts/check_containers.sh) - echo "##vso[task.setvariable variable=compose_command]$val" - task: DockerCompose@1 displayName: Pull container inputs: @@ -142,9 +134,9 @@ stages: containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' - dockerComposeCommand: '$(compose_command) ubuntu-cpp-clean' + dockerComposeCommand: 'pull ubuntu-cpp-clean' - task: DockerCompose@1 - displayName: Build container + displayName: Build and Test inputs: projectName: darma-tasking-vt containerregistrytype: 'Container Registry' @@ -172,17 +164,6 @@ stages: "$(Agent.JobStatus)" env: GITHUB_PAT: $(github_pat) - - task: DockerCompose@1 - displayName: Push container to registry - continueOnError: true - condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) - inputs: - projectName: darma-tasking-vt - containerregistrytype: 'Container Registry' - dockerRegistryEndpoint: 'dockerRegistryConnection1' - dockerComposeFile: '**/docker-compose.yml' - action: 'Run a Docker Compose command' - dockerComposeCommand: 'push ubuntu-cpp-clean' - task: Bash@3 displayName: Create artifacts continueOnError: true diff --git a/ci/azure/azure-clang-12-ubuntu-mpich.yml b/ci/azure/azure-clang-12-ubuntu-mpich.yml index bd9319307d..b8609b25f0 100644 --- a/ci/azure/azure-clang-12-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-12-ubuntu-mpich.yml @@ -127,14 +127,6 @@ stages: $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) $(Agent.OS) | "$(cache_name)" - - task: Bash@3 - displayName: Check for changes in containers - condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') - inputs: - targetType: 'inline' - script: | - val=$(./scripts/check_containers.sh) - echo "##vso[task.setvariable variable=compose_command]$val" - task: DockerCompose@1 displayName: Pull container inputs: @@ -142,9 +134,9 @@ stages: containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' - dockerComposeCommand: '$(compose_command) ubuntu-cpp-clean' + dockerComposeCommand: 'pull ubuntu-cpp-clean' - task: DockerCompose@1 - displayName: Build container + displayName: Build and Test inputs: projectName: darma-tasking-vt containerregistrytype: 'Container Registry' @@ -172,17 +164,6 @@ stages: "$(Agent.JobStatus)" env: GITHUB_PAT: $(github_pat) - - task: DockerCompose@1 - displayName: Push container to registry - continueOnError: true - condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) - inputs: - projectName: darma-tasking-vt - containerregistrytype: 'Container Registry' - dockerRegistryEndpoint: 'dockerRegistryConnection1' - dockerComposeFile: '**/docker-compose.yml' - action: 'Run a Docker Compose command' - dockerComposeCommand: 'push ubuntu-cpp-clean' - task: Bash@3 displayName: Create artifacts continueOnError: true diff --git a/ci/azure/azure-clang-13-ubuntu-mpich.yml b/ci/azure/azure-clang-13-ubuntu-mpich.yml index e8b44c88bf..7b3e95a05a 100644 --- a/ci/azure/azure-clang-13-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-13-ubuntu-mpich.yml @@ -127,14 +127,6 @@ stages: $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) $(Agent.OS) | "$(cache_name)" - - task: Bash@3 - displayName: Check for changes in containers - condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') - inputs: - targetType: 'inline' - script: | - val=$(./scripts/check_containers.sh) - echo "##vso[task.setvariable variable=compose_command]$val" - task: DockerCompose@1 displayName: Pull container inputs: @@ -142,9 +134,9 @@ stages: containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' - dockerComposeCommand: '$(compose_command) ubuntu-cpp-clean' + dockerComposeCommand: 'pull ubuntu-cpp-clean' - task: DockerCompose@1 - displayName: Build container + displayName: Build and Test inputs: projectName: darma-tasking-vt containerregistrytype: 'Container Registry' @@ -172,17 +164,6 @@ stages: "$(Agent.JobStatus)" env: GITHUB_PAT: $(github_pat) - - task: DockerCompose@1 - displayName: Push container to registry - continueOnError: true - condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) - inputs: - projectName: darma-tasking-vt - containerregistrytype: 'Container Registry' - dockerRegistryEndpoint: 'dockerRegistryConnection1' - dockerComposeFile: '**/docker-compose.yml' - action: 'Run a Docker Compose command' - dockerComposeCommand: 'push ubuntu-cpp-clean' - task: Bash@3 displayName: Create artifacts continueOnError: true diff --git a/ci/azure/azure-clang-14-ubuntu-mpich.yml b/ci/azure/azure-clang-14-ubuntu-mpich.yml index 8ea7f897aa..93b8e6b788 100644 --- a/ci/azure/azure-clang-14-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-14-ubuntu-mpich.yml @@ -127,14 +127,6 @@ stages: $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) $(Agent.OS) | "$(cache_name)" - - task: Bash@3 - displayName: Check for changes in containers - condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') - inputs: - targetType: 'inline' - script: | - val=$(./scripts/check_containers.sh) - echo "##vso[task.setvariable variable=compose_command]$val" - task: DockerCompose@1 displayName: Pull container inputs: @@ -142,9 +134,9 @@ stages: containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' - dockerComposeCommand: '$(compose_command) ubuntu-cpp-clean' + dockerComposeCommand: 'pull ubuntu-cpp-clean' - task: DockerCompose@1 - displayName: Build container + displayName: Build and Test inputs: projectName: darma-tasking-vt containerregistrytype: 'Container Registry' @@ -172,17 +164,6 @@ stages: "$(Agent.JobStatus)" env: GITHUB_PAT: $(github_pat) - - task: DockerCompose@1 - displayName: Push container to registry - continueOnError: true - condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) - inputs: - projectName: darma-tasking-vt - containerregistrytype: 'Container Registry' - dockerRegistryEndpoint: 'dockerRegistryConnection1' - dockerComposeFile: '**/docker-compose.yml' - action: 'Run a Docker Compose command' - dockerComposeCommand: 'push ubuntu-cpp-clean' - task: Bash@3 displayName: Create artifacts continueOnError: true diff --git a/ci/azure/azure-clang-16-ubuntu-mpich.yml b/ci/azure/azure-clang-16-ubuntu-mpich.yml index fad45fdb8e..740dea17f4 100644 --- a/ci/azure/azure-clang-16-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-16-ubuntu-mpich.yml @@ -127,14 +127,6 @@ stages: $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) $(Agent.OS) | "$(cache_name)" - - task: Bash@3 - displayName: Check for changes in containers - condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') - inputs: - targetType: 'inline' - script: | - val=$(./scripts/check_containers.sh) - echo "##vso[task.setvariable variable=compose_command]$val" - task: DockerCompose@1 displayName: Pull container inputs: @@ -142,9 +134,9 @@ stages: containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' - dockerComposeCommand: '$(compose_command) ubuntu-cpp-clean' + dockerComposeCommand: 'pull ubuntu-cpp-clean' - task: DockerCompose@1 - displayName: Build container + displayName: Build and Test inputs: projectName: darma-tasking-vt containerregistrytype: 'Container Registry' @@ -172,17 +164,6 @@ stages: "$(Agent.JobStatus)" env: GITHUB_PAT: $(github_pat) - - task: DockerCompose@1 - displayName: Push container to registry - continueOnError: true - condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) - inputs: - projectName: darma-tasking-vt - containerregistrytype: 'Container Registry' - dockerRegistryEndpoint: 'dockerRegistryConnection1' - dockerComposeFile: '**/docker-compose.yml' - action: 'Run a Docker Compose command' - dockerComposeCommand: 'push ubuntu-cpp-clean' - task: Bash@3 displayName: Create artifacts continueOnError: true diff --git a/ci/azure/azure-clang-17-ubuntu-mpich-perf.yml b/ci/azure/azure-clang-17-ubuntu-mpich-perf.yml index a9621b7bf2..9f7d02cdca 100644 --- a/ci/azure/azure-clang-17-ubuntu-mpich-perf.yml +++ b/ci/azure/azure-clang-17-ubuntu-mpich-perf.yml @@ -127,14 +127,6 @@ stages: $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) $(Agent.OS) | "$(cache_name)" - - task: Bash@3 - displayName: Check for changes in containers - condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') - inputs: - targetType: 'inline' - script: | - val=$(./scripts/check_containers.sh) - echo "##vso[task.setvariable variable=compose_command]$val" - task: DockerCompose@1 displayName: Pull container inputs: @@ -142,9 +134,9 @@ stages: containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' - dockerComposeCommand: '$(compose_command) ubuntu-cpp-clean --privileged' + dockerComposeCommand: 'pull ubuntu-cpp-clean' - task: DockerCompose@1 - displayName: Build container + displayName: Build and Test inputs: projectName: darma-tasking-vt containerregistrytype: 'Container Registry' @@ -172,17 +164,6 @@ stages: "$(Agent.JobStatus)" env: GITHUB_PAT: $(github_pat) - - task: DockerCompose@1 - displayName: Push container to registry - continueOnError: true - condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) - inputs: - projectName: darma-tasking-vt - containerregistrytype: 'Container Registry' - dockerRegistryEndpoint: 'dockerRegistryConnection1' - dockerComposeFile: '**/docker-compose.yml' - action: 'Run a Docker Compose command' - dockerComposeCommand: 'push ubuntu-cpp-clean' - task: Bash@3 displayName: Create artifacts continueOnError: true diff --git a/ci/azure/azure-clang-9-ubuntu-mpich.yml b/ci/azure/azure-clang-9-ubuntu-mpich.yml index e43203a0c2..b60ed5f71b 100644 --- a/ci/azure/azure-clang-9-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-9-ubuntu-mpich.yml @@ -127,14 +127,6 @@ stages: $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) $(Agent.OS) | "$(cache_name)" - - task: Bash@3 - displayName: Check for changes in containers - condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') - inputs: - targetType: 'inline' - script: | - val=$(./scripts/check_containers.sh) - echo "##vso[task.setvariable variable=compose_command]$val" - task: DockerCompose@1 displayName: Pull container inputs: @@ -142,9 +134,9 @@ stages: containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' - dockerComposeCommand: '$(compose_command) ubuntu-cpp-clean' + dockerComposeCommand: 'pull ubuntu-cpp-clean' - task: DockerCompose@1 - displayName: Build container + displayName: Build and Test inputs: projectName: darma-tasking-vt containerregistrytype: 'Container Registry' @@ -172,17 +164,6 @@ stages: "$(Agent.JobStatus)" env: GITHUB_PAT: $(github_pat) - - task: DockerCompose@1 - displayName: Push container to registry - continueOnError: true - condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) - inputs: - projectName: darma-tasking-vt - containerregistrytype: 'Container Registry' - dockerRegistryEndpoint: 'dockerRegistryConnection1' - dockerComposeFile: '**/docker-compose.yml' - action: 'Run a Docker Compose command' - dockerComposeCommand: 'push ubuntu-cpp-clean' - task: Bash@3 displayName: Create artifacts continueOnError: true diff --git a/ci/azure/azure-clang-alpine-mpich.yml b/ci/azure/azure-clang-alpine-mpich.yml index 2bdabc4fce..ef272f3b40 100644 --- a/ci/azure/azure-clang-alpine-mpich.yml +++ b/ci/azure/azure-clang-alpine-mpich.yml @@ -127,14 +127,6 @@ stages: $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) $(Agent.OS) | "$(cache_name)" - - task: Bash@3 - displayName: Check for changes in containers - condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') - inputs: - targetType: 'inline' - script: | - val=$(./scripts/check_containers.sh) - echo "##vso[task.setvariable variable=compose_command]$val" - task: DockerCompose@1 displayName: Pull container inputs: @@ -142,9 +134,9 @@ stages: containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' - dockerComposeCommand: '$(compose_command) alpine-cpp-clean' + dockerComposeCommand: 'pull alpine-cpp-clean' - task: DockerCompose@1 - displayName: Build container + displayName: Build and Test inputs: projectName: darma-tasking-vt containerregistrytype: 'Container Registry' @@ -172,17 +164,6 @@ stages: "$(Agent.JobStatus)" env: GITHUB_PAT: $(github_pat) - - task: DockerCompose@1 - displayName: Push container to registry - continueOnError: true - condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) - inputs: - projectName: darma-tasking-vt - containerregistrytype: 'Container Registry' - dockerRegistryEndpoint: 'dockerRegistryConnection1' - dockerComposeFile: '**/docker-compose.yml' - action: 'Run a Docker Compose command' - dockerComposeCommand: 'push alpine-cpp-clean' - task: Bash@3 displayName: Create artifacts continueOnError: true diff --git a/ci/azure/azure-gcc-10-ubuntu-openmpi-spack.yml b/ci/azure/azure-gcc-10-ubuntu-openmpi-spack.yml index 033ffbf78f..859137658b 100644 --- a/ci/azure/azure-gcc-10-ubuntu-openmpi-spack.yml +++ b/ci/azure/azure-gcc-10-ubuntu-openmpi-spack.yml @@ -120,14 +120,6 @@ stages: $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) $(Agent.OS) | "$(cache_name)" - - task: Bash@3 - displayName: Check for changes in containers - condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') - inputs: - targetType: 'inline' - script: | - val=$(./scripts/check_containers.sh) - echo "##vso[task.setvariable variable=compose_command]$val" - task: DockerCompose@1 displayName: Pull container inputs: @@ -135,9 +127,9 @@ stages: containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' - dockerComposeCommand: '$(compose_command) ubuntu-spack' + dockerComposeCommand: 'pull ubuntu-spack' - task: DockerCompose@1 - displayName: Build container + displayName: Build and Test inputs: projectName: darma-tasking-vt containerregistrytype: 'Container Registry' @@ -165,17 +157,6 @@ stages: "$(Agent.JobStatus)" env: GITHUB_PAT: $(github_pat) - - task: DockerCompose@1 - displayName: Push container to registry - continueOnError: true - condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) - inputs: - projectName: darma-tasking-vt - containerregistrytype: 'Container Registry' - dockerRegistryEndpoint: 'dockerRegistryConnection1' - dockerComposeFile: '**/docker-compose.yml' - action: 'Run a Docker Compose command' - dockerComposeCommand: 'push ubuntu-spack' - task: Bash@3 displayName: Create artifacts continueOnError: true diff --git a/ci/azure/azure-gcc-10-ubuntu-openmpi.yml b/ci/azure/azure-gcc-10-ubuntu-openmpi.yml index eeb5c34260..5fdf9e8833 100644 --- a/ci/azure/azure-gcc-10-ubuntu-openmpi.yml +++ b/ci/azure/azure-gcc-10-ubuntu-openmpi.yml @@ -127,14 +127,6 @@ stages: $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) $(Agent.OS) | "$(cache_name)" - - task: Bash@3 - displayName: Check for changes in containers - condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') - inputs: - targetType: 'inline' - script: | - val=$(./scripts/check_containers.sh) - echo "##vso[task.setvariable variable=compose_command]$val" - task: DockerCompose@1 displayName: Pull container inputs: @@ -142,9 +134,9 @@ stages: containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' - dockerComposeCommand: '$(compose_command) ubuntu-cpp-clean-openmpi' + dockerComposeCommand: 'pull ubuntu-cpp-clean-openmpi' - task: DockerCompose@1 - displayName: Build container + displayName: Build and Test inputs: projectName: darma-tasking-vt containerregistrytype: 'Container Registry' @@ -172,17 +164,6 @@ stages: "$(Agent.JobStatus)" env: GITHUB_PAT: $(github_pat) - - task: DockerCompose@1 - displayName: Push container to registry - continueOnError: true - condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) - inputs: - projectName: darma-tasking-vt - containerregistrytype: 'Container Registry' - dockerRegistryEndpoint: 'dockerRegistryConnection1' - dockerComposeFile: '**/docker-compose.yml' - action: 'Run a Docker Compose command' - dockerComposeCommand: 'push ubuntu-cpp-clean-openmpi' - task: Bash@3 displayName: Create artifacts continueOnError: true diff --git a/ci/azure/azure-gcc-11-ubuntu-mpich.yml b/ci/azure/azure-gcc-11-ubuntu-mpich.yml index 826ab8e147..6d747a2be0 100644 --- a/ci/azure/azure-gcc-11-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-11-ubuntu-mpich.yml @@ -127,14 +127,6 @@ stages: $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) $(Agent.OS) | "$(cache_name)" - - task: Bash@3 - displayName: Check for changes in containers - condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') - inputs: - targetType: 'inline' - script: | - val=$(./scripts/check_containers.sh) - echo "##vso[task.setvariable variable=compose_command]$val" - task: DockerCompose@1 displayName: Pull container inputs: @@ -142,9 +134,9 @@ stages: containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' - dockerComposeCommand: '$(compose_command) ubuntu-cpp-clean-noinstall' + dockerComposeCommand: 'pull ubuntu-cpp-clean-noinstall' - task: DockerCompose@1 - displayName: Build container + displayName: Build and Test inputs: projectName: darma-tasking-vt containerregistrytype: 'Container Registry' @@ -172,17 +164,6 @@ stages: "$(Agent.JobStatus)" env: GITHUB_PAT: $(github_pat) - - task: DockerCompose@1 - displayName: Push container to registry - continueOnError: true - condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) - inputs: - projectName: darma-tasking-vt - containerregistrytype: 'Container Registry' - dockerRegistryEndpoint: 'dockerRegistryConnection1' - dockerComposeFile: '**/docker-compose.yml' - action: 'Run a Docker Compose command' - dockerComposeCommand: 'push ubuntu-cpp-clean-noinstall' - task: Bash@3 displayName: Create artifacts continueOnError: true diff --git a/ci/azure/azure-gcc-12-ubuntu-mpich.yml b/ci/azure/azure-gcc-12-ubuntu-mpich.yml index 47b5a1667e..efb2152740 100644 --- a/ci/azure/azure-gcc-12-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-12-ubuntu-mpich.yml @@ -127,14 +127,6 @@ stages: $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) $(Agent.OS) | "$(cache_name)" - - task: Bash@3 - displayName: Check for changes in containers - condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') - inputs: - targetType: 'inline' - script: | - val=$(./scripts/check_containers.sh) - echo "##vso[task.setvariable variable=compose_command]$val" - task: DockerCompose@1 displayName: Pull container inputs: @@ -142,9 +134,9 @@ stages: containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' - dockerComposeCommand: '$(compose_command) ubuntu-cpp-clean' + dockerComposeCommand: 'pull ubuntu-cpp-clean' - task: DockerCompose@1 - displayName: Build container + displayName: Build and Test inputs: projectName: darma-tasking-vt containerregistrytype: 'Container Registry' @@ -172,17 +164,6 @@ stages: "$(Agent.JobStatus)" env: GITHUB_PAT: $(github_pat) - - task: DockerCompose@1 - displayName: Push container to registry - continueOnError: true - condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) - inputs: - projectName: darma-tasking-vt - containerregistrytype: 'Container Registry' - dockerRegistryEndpoint: 'dockerRegistryConnection1' - dockerComposeFile: '**/docker-compose.yml' - action: 'Run a Docker Compose command' - dockerComposeCommand: 'push ubuntu-cpp-clean' - task: Bash@3 displayName: Create artifacts continueOnError: true diff --git a/ci/azure/azure-gcc-12-ubuntu-vttv.yml b/ci/azure/azure-gcc-12-ubuntu-vttv.yml index 7ad6fa5714..cc3e69ef2e 100644 --- a/ci/azure/azure-gcc-12-ubuntu-vttv.yml +++ b/ci/azure/azure-gcc-12-ubuntu-vttv.yml @@ -127,14 +127,6 @@ stages: $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) $(Agent.OS) | "$(cache_name)" - - task: Bash@3 - displayName: Check for changes in containers - condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') - inputs: - targetType: 'inline' - script: | - val=$(./scripts/check_containers.sh) - echo "##vso[task.setvariable variable=compose_command]$val" - task: DockerCompose@1 displayName: Pull container inputs: @@ -142,9 +134,9 @@ stages: containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' - dockerComposeCommand: '$(compose_command) ubuntu-cpp-vtk' + dockerComposeCommand: 'pull ubuntu-cpp-vtk' - task: DockerCompose@1 - displayName: Build container + displayName: Build and Test inputs: projectName: darma-tasking-vt containerregistrytype: 'Container Registry' @@ -172,17 +164,6 @@ stages: "$(Agent.JobStatus)" env: GITHUB_PAT: $(github_pat) - - task: DockerCompose@1 - displayName: Push container to registry - continueOnError: true - condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) - inputs: - projectName: darma-tasking-vt - containerregistrytype: 'Container Registry' - dockerRegistryEndpoint: 'dockerRegistryConnection1' - dockerComposeFile: '**/docker-compose.yml' - action: 'Run a Docker Compose command' - dockerComposeCommand: 'push ubuntu-cpp-vtk' - task: Bash@3 displayName: Create artifacts continueOnError: true diff --git a/ci/azure/azure-gcc-13-ubuntu-mpich.yml b/ci/azure/azure-gcc-13-ubuntu-mpich.yml index 9d7423d693..1e44587594 100644 --- a/ci/azure/azure-gcc-13-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-13-ubuntu-mpich.yml @@ -127,14 +127,6 @@ stages: $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) $(Agent.OS) | "$(cache_name)" - - task: Bash@3 - displayName: Check for changes in containers - condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') - inputs: - targetType: 'inline' - script: | - val=$(./scripts/check_containers.sh) - echo "##vso[task.setvariable variable=compose_command]$val" - task: DockerCompose@1 displayName: Pull container inputs: @@ -142,9 +134,9 @@ stages: containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' - dockerComposeCommand: '$(compose_command) ubuntu-cpp-clean' + dockerComposeCommand: 'pull ubuntu-cpp-clean' - task: DockerCompose@1 - displayName: Build container + displayName: Build and Test inputs: projectName: darma-tasking-vt containerregistrytype: 'Container Registry' @@ -172,17 +164,6 @@ stages: "$(Agent.JobStatus)" env: GITHUB_PAT: $(github_pat) - - task: DockerCompose@1 - displayName: Push container to registry - continueOnError: true - condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) - inputs: - projectName: darma-tasking-vt - containerregistrytype: 'Container Registry' - dockerRegistryEndpoint: 'dockerRegistryConnection1' - dockerComposeFile: '**/docker-compose.yml' - action: 'Run a Docker Compose command' - dockerComposeCommand: 'push ubuntu-cpp-clean' - task: Bash@3 displayName: Create artifacts continueOnError: true diff --git a/ci/azure/azure-gcc-14-ubuntu-perf.yml b/ci/azure/azure-gcc-14-ubuntu-perf.yml index 18313269f6..360b2c1a5b 100644 --- a/ci/azure/azure-gcc-14-ubuntu-perf.yml +++ b/ci/azure/azure-gcc-14-ubuntu-perf.yml @@ -127,14 +127,6 @@ stages: $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) $(Agent.OS) | "$(cache_name)" - - task: Bash@3 - displayName: Check for changes in containers - condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') - inputs: - targetType: 'inline' - script: | - val=$(./scripts/check_containers.sh) - echo "##vso[task.setvariable variable=compose_command]$val" - task: DockerCompose@1 displayName: Pull container inputs: @@ -142,9 +134,9 @@ stages: containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' - dockerComposeCommand: '$(compose_command) ubuntu-cpp-clean --privileged' + dockerComposeCommand: 'pull ubuntu-cpp-clean' - task: DockerCompose@1 - displayName: Build container + displayName: Build and Test inputs: projectName: darma-tasking-vt containerregistrytype: 'Container Registry' @@ -172,17 +164,6 @@ stages: "$(Agent.JobStatus)" env: GITHUB_PAT: $(github_pat) - - task: DockerCompose@1 - displayName: Push container to registry - continueOnError: true - condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) - inputs: - projectName: darma-tasking-vt - containerregistrytype: 'Container Registry' - dockerRegistryEndpoint: 'dockerRegistryConnection1' - dockerComposeFile: '**/docker-compose.yml' - action: 'Run a Docker Compose command' - dockerComposeCommand: 'push ubuntu-cpp-clean' - task: Bash@3 displayName: Create artifacts continueOnError: true diff --git a/ci/azure/azure-gcc-9-ubuntu-mpich.yml b/ci/azure/azure-gcc-9-ubuntu-mpich.yml index 53ce46e7d9..2c54e3e931 100644 --- a/ci/azure/azure-gcc-9-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-9-ubuntu-mpich.yml @@ -127,14 +127,6 @@ stages: $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) $(Agent.OS) | "$(cache_name)" - - task: Bash@3 - displayName: Check for changes in containers - condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') - inputs: - targetType: 'inline' - script: | - val=$(./scripts/check_containers.sh) - echo "##vso[task.setvariable variable=compose_command]$val" - task: DockerCompose@1 displayName: Pull container inputs: @@ -142,9 +134,9 @@ stages: containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' - dockerComposeCommand: '$(compose_command) ubuntu-cpp-clean' + dockerComposeCommand: 'pull ubuntu-cpp-clean' - task: DockerCompose@1 - displayName: Build container + displayName: Build and Test inputs: projectName: darma-tasking-vt containerregistrytype: 'Container Registry' @@ -172,17 +164,6 @@ stages: "$(Agent.JobStatus)" env: GITHUB_PAT: $(github_pat) - - task: DockerCompose@1 - displayName: Push container to registry - continueOnError: true - condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) - inputs: - projectName: darma-tasking-vt - containerregistrytype: 'Container Registry' - dockerRegistryEndpoint: 'dockerRegistryConnection1' - dockerComposeFile: '**/docker-compose.yml' - action: 'Run a Docker Compose command' - dockerComposeCommand: 'push ubuntu-cpp-clean' - task: Bash@3 displayName: Create artifacts continueOnError: true diff --git a/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml b/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml index dcb74cf323..9f6d9ce190 100644 --- a/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml +++ b/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml @@ -127,14 +127,6 @@ stages: $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) $(Agent.OS) | "$(cache_name)" - - task: Bash@3 - displayName: Check for changes in containers - condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') - inputs: - targetType: 'inline' - script: | - val=$(./scripts/check_containers.sh) - echo "##vso[task.setvariable variable=compose_command]$val" - task: DockerCompose@1 displayName: Pull container inputs: @@ -142,9 +134,9 @@ stages: containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' - dockerComposeCommand: '$(compose_command) ubuntu-cpp-clean' + dockerComposeCommand: 'pull ubuntu-cpp-clean' - task: DockerCompose@1 - displayName: Build container + displayName: Build and Test inputs: projectName: darma-tasking-vt containerregistrytype: 'Container Registry' @@ -172,17 +164,6 @@ stages: "$(Agent.JobStatus)" env: GITHUB_PAT: $(github_pat) - - task: DockerCompose@1 - displayName: Push container to registry - continueOnError: true - condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) - inputs: - projectName: darma-tasking-vt - containerregistrytype: 'Container Registry' - dockerRegistryEndpoint: 'dockerRegistryConnection1' - dockerComposeFile: '**/docker-compose.yml' - action: 'Run a Docker Compose command' - dockerComposeCommand: 'push ubuntu-cpp-clean' - task: Bash@3 displayName: Create artifacts continueOnError: true diff --git a/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml b/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml index 5995d17712..c60a643b3b 100644 --- a/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml +++ b/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml @@ -127,14 +127,6 @@ stages: $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) $(Agent.OS) | "$(cache_name)" - - task: Bash@3 - displayName: Check for changes in containers - condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') - inputs: - targetType: 'inline' - script: | - val=$(./scripts/check_containers.sh) - echo "##vso[task.setvariable variable=compose_command]$val" - task: DockerCompose@1 displayName: Pull container inputs: @@ -142,9 +134,9 @@ stages: containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' - dockerComposeCommand: '$(compose_command) ubuntu-cpp-clean' + dockerComposeCommand: 'pull ubuntu-cpp-clean' - task: DockerCompose@1 - displayName: Build container + displayName: Build and Test inputs: projectName: darma-tasking-vt containerregistrytype: 'Container Registry' @@ -172,17 +164,6 @@ stages: "$(Agent.JobStatus)" env: GITHUB_PAT: $(github_pat) - - task: DockerCompose@1 - displayName: Push container to registry - continueOnError: true - condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) - inputs: - projectName: darma-tasking-vt - containerregistrytype: 'Container Registry' - dockerRegistryEndpoint: 'dockerRegistryConnection1' - dockerComposeFile: '**/docker-compose.yml' - action: 'Run a Docker Compose command' - dockerComposeCommand: 'push ubuntu-cpp-clean' - task: Bash@3 displayName: Create artifacts continueOnError: true diff --git a/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml b/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml index ddc0cdd411..2aff672674 100644 --- a/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml +++ b/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml @@ -127,14 +127,6 @@ stages: $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) $(Agent.OS) | "$(cache_name)" - - task: Bash@3 - displayName: Check for changes in containers - condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') - inputs: - targetType: 'inline' - script: | - val=$(./scripts/check_containers.sh) - echo "##vso[task.setvariable variable=compose_command]$val" - task: DockerCompose@1 displayName: Pull container inputs: @@ -142,9 +134,9 @@ stages: containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' - dockerComposeCommand: '$(compose_command) ubuntu-cpp-clean' + dockerComposeCommand: 'pull ubuntu-cpp-clean' - task: DockerCompose@1 - displayName: Build container + displayName: Build and Test inputs: projectName: darma-tasking-vt containerregistrytype: 'Container Registry' @@ -172,17 +164,6 @@ stages: "$(Agent.JobStatus)" env: GITHUB_PAT: $(github_pat) - - task: DockerCompose@1 - displayName: Push container to registry - continueOnError: true - condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) - inputs: - projectName: darma-tasking-vt - containerregistrytype: 'Container Registry' - dockerRegistryEndpoint: 'dockerRegistryConnection1' - dockerComposeFile: '**/docker-compose.yml' - action: 'Run a Docker Compose command' - dockerComposeCommand: 'push ubuntu-cpp-clean' - task: Bash@3 displayName: Create artifacts continueOnError: true diff --git a/ci/azure/azure-nvidia-12-ubuntu-mpich.yml b/ci/azure/azure-nvidia-12-ubuntu-mpich.yml index b0daea478d..5f6a3ce63f 100644 --- a/ci/azure/azure-nvidia-12-ubuntu-mpich.yml +++ b/ci/azure/azure-nvidia-12-ubuntu-mpich.yml @@ -127,14 +127,6 @@ stages: $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) $(Agent.OS) | "$(cache_name)" - - task: Bash@3 - displayName: Check for changes in containers - condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') - inputs: - targetType: 'inline' - script: | - val=$(./scripts/check_containers.sh) - echo "##vso[task.setvariable variable=compose_command]$val" - task: DockerCompose@1 displayName: Pull container inputs: @@ -142,9 +134,9 @@ stages: containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' - dockerComposeCommand: '$(compose_command) ubuntu-cpp-clean' + dockerComposeCommand: 'pull ubuntu-cpp-clean' - task: DockerCompose@1 - displayName: Build container + displayName: Build and Test inputs: projectName: darma-tasking-vt containerregistrytype: 'Container Registry' @@ -172,17 +164,6 @@ stages: "$(Agent.JobStatus)" env: GITHUB_PAT: $(github_pat) - - task: DockerCompose@1 - displayName: Push container to registry - continueOnError: true - condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) - inputs: - projectName: darma-tasking-vt - containerregistrytype: 'Container Registry' - dockerRegistryEndpoint: 'dockerRegistryConnection1' - dockerComposeFile: '**/docker-compose.yml' - action: 'Run a Docker Compose command' - dockerComposeCommand: 'push ubuntu-cpp-clean' - task: Bash@3 displayName: Create artifacts continueOnError: true diff --git a/docker-compose.yml b/docker-compose.yml index 660fbc796b..16f743fd5e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -65,9 +65,9 @@ # Volume will be created automatically for each combination of parameters. volumes: ubuntu-cpp: - name: "${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-cache" + name: "${ARCH}-ubuntu-${UBUNTU}-${COMPILER}-cache" alpine-cpp: - name: "${ARCH}-alpine-${HOST_COMPILER}-${COMPILER}-cache" + name: "${ARCH}-alpine-${COMPILER}-cache" # Define basic rules for ccache used across multiple services. The beauty of # docker compose with cached volumes is that similarly configured builds will @@ -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}-${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}-${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}-${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}-${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}-${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}-${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}-${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}-${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}-${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}-${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-${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-${COMPILER}-cpp ulimits: *ulimits environment: <<: [*ccache, *vtopts] diff --git a/scripts/workflow-azure-template.yml b/scripts/workflow-azure-template.yml index ce6b1104e8..05c51cfea0 100644 --- a/scripts/workflow-azure-template.yml +++ b/scripts/workflow-azure-template.yml @@ -115,14 +115,6 @@ stages: $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) $(Agent.OS) | "$(cache_name)" - - task: Bash@3 - displayName: Check for changes in containers - condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') - inputs: - targetType: 'inline' - script: | - val=$(./scripts/check_containers.sh) - echo "##vso[task.setvariable variable=compose_command]$val" - task: DockerCompose@1 displayName: Pull container inputs: @@ -130,9 +122,9 @@ stages: containerregistrytype: 'Container Registry' dockerComposeFile: '**/docker-compose.yml' action: 'Run a Docker Compose command' - dockerComposeCommand: '$(compose_command) [% docker_target %][% IF privileged %] --privileged[% END %]' + dockerComposeCommand: 'pull [% docker_target %]' - task: DockerCompose@1 - displayName: Build container + displayName: Build and Test inputs: projectName: darma-tasking-vt containerregistrytype: 'Container Registry' @@ -160,17 +152,6 @@ stages: "$(Agent.JobStatus)" env: GITHUB_PAT: $(github_pat) - - task: DockerCompose@1 - displayName: Push container to registry - continueOnError: true - condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop')) - inputs: - projectName: darma-tasking-vt - containerregistrytype: 'Container Registry' - dockerRegistryEndpoint: 'dockerRegistryConnection1' - dockerComposeFile: '**/docker-compose.yml' - action: 'Run a Docker Compose command' - dockerComposeCommand: 'push [% docker_target %]' - task: Bash@3 displayName: Create artifacts continueOnError: true