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] #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