From e7af7c3864f6c39823773f4c7611f1f4233d74b2 Mon Sep 17 00:00:00 2001 From: Arkadiusz Szczepkowicz Date: Tue, 24 Oct 2023 17:21:08 +0200 Subject: [PATCH 01/12] #2121: Generalize names of named volumes --- ci/azure/azure-clang-10-ubuntu-mpich.yml | 7 ++ ci/azure/azure-clang-11-ubuntu-mpich.yml | 7 ++ ci/azure/azure-clang-12-ubuntu-mpich.yml | 7 ++ ci/azure/azure-clang-13-ubuntu-mpich.yml | 7 ++ ci/azure/azure-clang-14-ubuntu-mpich.yml | 7 ++ ci/azure/azure-clang-9-ubuntu-mpich.yml | 7 ++ ci/azure/azure-clang-alpine-mpich.yml | 7 ++ ci/azure/azure-gcc-10-ubuntu-openmpi.yml | 7 ++ ci/azure/azure-gcc-11-ubuntu-mpich.yml | 7 ++ ci/azure/azure-gcc-12-ubuntu-mpich.yml | 7 ++ ci/azure/azure-gcc-8-ubuntu-mpich.yml | 7 ++ ci/azure/azure-gcc-9-ubuntu-mpich.yml | 7 ++ .../azure-intel-oneapi-icpc-ubuntu-mpich.yml | 7 ++ .../azure-intel-oneapi-icpx-ubuntu-mpich.yml | 7 ++ ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml | 7 ++ ci/azure/azure-nvidia-12-ubuntu-mpich.yml | 7 ++ docker-compose.yml | 71 ++++--------------- scripts/workflow-azure-template.yml | 7 ++ 18 files changed, 134 insertions(+), 56 deletions(-) diff --git a/ci/azure/azure-clang-10-ubuntu-mpich.yml b/ci/azure/azure-clang-10-ubuntu-mpich.yml index 158c3674ae..b86888fa45 100644 --- a/ci/azure/azure-clang-10-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-10-ubuntu-mpich.yml @@ -127,6 +127,13 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" + - task: Bash@3 + displayName: Create directory for docker volume + condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') + inputs: + targetType: 'inline' + script: | + mkdir -p "$(build_root)" - task: DockerCompose@0 displayName: Pull container inputs: diff --git a/ci/azure/azure-clang-11-ubuntu-mpich.yml b/ci/azure/azure-clang-11-ubuntu-mpich.yml index ce3d337b8f..dfee5a23f6 100644 --- a/ci/azure/azure-clang-11-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-11-ubuntu-mpich.yml @@ -127,6 +127,13 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" + - task: Bash@3 + displayName: Create directory for docker volume + condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') + inputs: + targetType: 'inline' + script: | + mkdir -p "$(build_root)" - task: DockerCompose@0 displayName: Pull container inputs: diff --git a/ci/azure/azure-clang-12-ubuntu-mpich.yml b/ci/azure/azure-clang-12-ubuntu-mpich.yml index 102af8d15c..51a0e42ec2 100644 --- a/ci/azure/azure-clang-12-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-12-ubuntu-mpich.yml @@ -127,6 +127,13 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" + - task: Bash@3 + displayName: Create directory for docker volume + condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') + inputs: + targetType: 'inline' + script: | + mkdir -p "$(build_root)" - task: DockerCompose@0 displayName: Pull container inputs: diff --git a/ci/azure/azure-clang-13-ubuntu-mpich.yml b/ci/azure/azure-clang-13-ubuntu-mpich.yml index 390f04178a..eb9f5cff81 100644 --- a/ci/azure/azure-clang-13-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-13-ubuntu-mpich.yml @@ -127,6 +127,13 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" + - task: Bash@3 + displayName: Create directory for docker volume + condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') + inputs: + targetType: 'inline' + script: | + mkdir -p "$(build_root)" - task: DockerCompose@0 displayName: Pull container inputs: diff --git a/ci/azure/azure-clang-14-ubuntu-mpich.yml b/ci/azure/azure-clang-14-ubuntu-mpich.yml index 4620d628b0..5e8d13d013 100644 --- a/ci/azure/azure-clang-14-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-14-ubuntu-mpich.yml @@ -127,6 +127,13 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" + - task: Bash@3 + displayName: Create directory for docker volume + condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') + inputs: + targetType: 'inline' + script: | + mkdir -p "$(build_root)" - task: DockerCompose@0 displayName: Pull container inputs: diff --git a/ci/azure/azure-clang-9-ubuntu-mpich.yml b/ci/azure/azure-clang-9-ubuntu-mpich.yml index 4219a637e0..5fe8bdb520 100644 --- a/ci/azure/azure-clang-9-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-9-ubuntu-mpich.yml @@ -127,6 +127,13 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" + - task: Bash@3 + displayName: Create directory for docker volume + condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') + inputs: + targetType: 'inline' + script: | + mkdir -p "$(build_root)" - task: DockerCompose@0 displayName: Pull container inputs: diff --git a/ci/azure/azure-clang-alpine-mpich.yml b/ci/azure/azure-clang-alpine-mpich.yml index 8a76770e33..690136e7e0 100644 --- a/ci/azure/azure-clang-alpine-mpich.yml +++ b/ci/azure/azure-clang-alpine-mpich.yml @@ -127,6 +127,13 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" + - task: Bash@3 + displayName: Create directory for docker volume + condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') + inputs: + targetType: 'inline' + script: | + mkdir -p "$(build_root)" - task: DockerCompose@0 displayName: Pull container inputs: diff --git a/ci/azure/azure-gcc-10-ubuntu-openmpi.yml b/ci/azure/azure-gcc-10-ubuntu-openmpi.yml index e29721e78d..bd43f8d8d4 100644 --- a/ci/azure/azure-gcc-10-ubuntu-openmpi.yml +++ b/ci/azure/azure-gcc-10-ubuntu-openmpi.yml @@ -127,6 +127,13 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" + - task: Bash@3 + displayName: Create directory for docker volume + condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') + inputs: + targetType: 'inline' + script: | + mkdir -p "$(build_root)" - task: DockerCompose@0 displayName: Pull container inputs: diff --git a/ci/azure/azure-gcc-11-ubuntu-mpich.yml b/ci/azure/azure-gcc-11-ubuntu-mpich.yml index e11fec7232..c4771dea0b 100644 --- a/ci/azure/azure-gcc-11-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-11-ubuntu-mpich.yml @@ -127,6 +127,13 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" + - task: Bash@3 + displayName: Create directory for docker volume + condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') + inputs: + targetType: 'inline' + script: | + mkdir -p "$(build_root)" - task: DockerCompose@0 displayName: Pull container inputs: diff --git a/ci/azure/azure-gcc-12-ubuntu-mpich.yml b/ci/azure/azure-gcc-12-ubuntu-mpich.yml index 2187c26b7c..6396f825c6 100644 --- a/ci/azure/azure-gcc-12-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-12-ubuntu-mpich.yml @@ -127,6 +127,13 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" + - task: Bash@3 + displayName: Create directory for docker volume + condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') + inputs: + targetType: 'inline' + script: | + mkdir -p "$(build_root)" - task: DockerCompose@0 displayName: Pull container inputs: diff --git a/ci/azure/azure-gcc-8-ubuntu-mpich.yml b/ci/azure/azure-gcc-8-ubuntu-mpich.yml index 4bb75fb294..904a607bd3 100644 --- a/ci/azure/azure-gcc-8-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-8-ubuntu-mpich.yml @@ -127,6 +127,13 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" + - task: Bash@3 + displayName: Create directory for docker volume + condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') + inputs: + targetType: 'inline' + script: | + mkdir -p "$(build_root)" - task: DockerCompose@0 displayName: Pull container inputs: diff --git a/ci/azure/azure-gcc-9-ubuntu-mpich.yml b/ci/azure/azure-gcc-9-ubuntu-mpich.yml index ae2db9107c..eadf493cd1 100644 --- a/ci/azure/azure-gcc-9-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-9-ubuntu-mpich.yml @@ -127,6 +127,13 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" + - task: Bash@3 + displayName: Create directory for docker volume + condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') + inputs: + targetType: 'inline' + script: | + mkdir -p "$(build_root)" - task: DockerCompose@0 displayName: Pull container inputs: diff --git a/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml b/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml index 4390ba7cbb..39ae955260 100644 --- a/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml +++ b/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml @@ -127,6 +127,13 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" + - task: Bash@3 + displayName: Create directory for docker volume + condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') + inputs: + targetType: 'inline' + script: | + mkdir -p "$(build_root)" - task: DockerCompose@0 displayName: Pull container inputs: diff --git a/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml b/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml index 3e8ebcd202..60561fae16 100644 --- a/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml +++ b/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml @@ -127,6 +127,13 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" + - task: Bash@3 + displayName: Create directory for docker volume + condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') + inputs: + targetType: 'inline' + script: | + mkdir -p "$(build_root)" - task: DockerCompose@0 displayName: Pull container inputs: diff --git a/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml b/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml index 1f4a0d3660..98016ed7dd 100644 --- a/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml +++ b/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml @@ -127,6 +127,13 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" + - task: Bash@3 + displayName: Create directory for docker volume + condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') + inputs: + targetType: 'inline' + script: | + mkdir -p "$(build_root)" - task: DockerCompose@0 displayName: Pull container inputs: diff --git a/ci/azure/azure-nvidia-12-ubuntu-mpich.yml b/ci/azure/azure-nvidia-12-ubuntu-mpich.yml index 43465d1794..045618e2a9 100644 --- a/ci/azure/azure-nvidia-12-ubuntu-mpich.yml +++ b/ci/azure/azure-nvidia-12-ubuntu-mpich.yml @@ -127,6 +127,13 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" + - task: Bash@3 + displayName: Create directory for docker volume + condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') + inputs: + targetType: 'inline' + script: | + mkdir -p "$(build_root)" - task: DockerCompose@0 displayName: Pull container inputs: diff --git a/docker-compose.yml b/docker-compose.yml index 4f6a9312bf..7d9ffe0d76 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -65,61 +65,20 @@ # Need verision >= 3.5 for the features in use version: '3.8' -# Named volumes must be predefined according the docker compose rules. Many -# combinations have already been added, but if a needed configuration is missing -# add it to this list. For example, for ARM64v8 on Ubuntu 20.04 with clang-9, -# add `arm64v8-ubuntu-20.04-clang-9-clang-9-cache`. +# Volume will be created automatically for each combination of parameters. volumes: - amd64-ubuntu-18.04-clang-8-clang-8-cache: - amd64-ubuntu-18.04-clang-9-clang-9-cache: - amd64-ubuntu-20.04-clang-10-clang-10-cache: - amd64-ubuntu-22.04-clang-11-clang-11-cache: - amd64-ubuntu-18.04-gcc-8-gcc-8-cache: - amd64-ubuntu-20.04-gcc-9-gcc-9-cache: - amd64-ubuntu-20.04-gcc-10-gcc-10-cache: - amd64-ubuntu-22.04-gcc-12-gcc-12-cache: - amd64-ubuntu-18.04-icpx-icpx-cache: - amd64-ubuntu-18.04-icpc-icpc-cache: - amd64-ubuntu-20.04-gcc-9-11.0.3-cache: - amd64-ubuntu-20.04-gcc-9-11.2.0-cache: - amd64-alpine-clang-8-clang-8-cache: - amd64-alpine-clang-9-clang-9-cache: - amd64-alpine-clang-10-clang-10-cache: - amd64-alpine-clang-11-clang-11-cache: - amd64-alpine-clang-13-clang-13-cache: - amd64-alpine-gcc-8-gcc-8-cache: - amd64-alpine-gcc-9-gcc-9-cache: - amd64-alpine-gcc-10-gcc-10-cache: - amd64-alpine-gcc-12-gcc-12-cache: - amd64-alpine-icpx-icpx-cache: - amd64-alpine-icpc-icpc-cache: - amd64-alpine-gcc-9-11.0.3-cache: - amd64-alpine-gcc-9-11.2.0-cache: - arm64v8-ubuntu-18.04-clang-8-clang-8-cache: - arm64v8-ubuntu-18.04-clang-9-clang-9-cache: - arm64v8-ubuntu-20.04-clang-10-clang-10-cache: - arm64v8-ubuntu-22.04-clang-11-clang-11-cache: - arm64v8-ubuntu-18.04-gcc-8-gcc-8-cache: - arm64v8-ubuntu-20.04-gcc-9-gcc-9-cache: - arm64v8-ubuntu-20.04-gcc-10-gcc-10-cache: - arm64v8-ubuntu-22.04-gcc-12-gcc-12-cache: - arm64v8-ubuntu-18.04-icpx-icpx-cache: - arm64v8-ubuntu-18.04-icpc-icpc-cache: - arm64v8-ubuntu-20.04-gcc-9-11.0.3-cache: - arm64v8-ubuntu-20.04-gcc-9-11.2.0-cache: - arm64v8-alpine-clang-8-clang-8-cache: - arm64v8-alpine-clang-9-clang-9-cache: - arm64v8-alpine-clang-10-clang-10-cache: - arm64v8-alpine-clang-11-clang-11-cache: - arm64v8-alpine-clang-13-clang-13-cache: - arm64v8-alpine-gcc-8-gcc-8-cache: - arm64v8-alpine-gcc-9-gcc-9-cache: - arm64v8-alpine-gcc-10-gcc-10-cache: - arm64v8-alpine-gcc-12-gcc-12-cache: - arm64v8-alpine-icpx-icpx-cache: - arm64v8-alpine-icpc-icpc-cache: - arm64v8-alpine-gcc-9-11.0.3-cache: - arm64v8-alpine-gcc-9-11.2.0-cache: + ubuntu-cpp: + name: "${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-cache" + driver_opts: + type: "none" + o: "bind" + device: "${CACHE}${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-cache" + alpine-cpp: + name: "${ARCH}-alpine-${HOST_COMPILER}-${COMPILER}-cache" + driver_opts: + type: "none" + o: "bind" + device: "${CACHE}${ARCH}-alpine-${HOST_COMPILER}-${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 @@ -195,7 +154,7 @@ services: <<: [*ccache, *vtopts] volumes: &ubuntu-volumes - .:/vt:delegated - - ${CACHE}${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-cache:/build:delegated + - ubuntu-cpp:/build:delegated command: &vt-cpp-command > /bin/bash -c " /vt/ci/build_cpp.sh /vt /build && @@ -425,7 +384,7 @@ services: <<: [*ccache, *vtopts] volumes: &alpine-volumes - .:/vt:delegated - - ${CACHE}${ARCH}-alpine-${HOST_COMPILER}-${COMPILER}-cache:/build:delegated + - alpine-cpp:/build:delegated command: *vt-cpp-command ############################################################################## diff --git a/scripts/workflow-azure-template.yml b/scripts/workflow-azure-template.yml index aa4a566cb2..f34518669a 100644 --- a/scripts/workflow-azure-template.yml +++ b/scripts/workflow-azure-template.yml @@ -115,6 +115,13 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" + - task: Bash@3 + displayName: Create directory for docker volume + condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') + inputs: + targetType: 'inline' + script: | + mkdir -p "$(build_root)" - task: DockerCompose@0 displayName: Pull container inputs: From 96e0578b862e4114b166608a2dbf461b6e0972f1 Mon Sep 17 00:00:00 2001 From: Arkadiusz Szczepkowicz Date: Fri, 8 Dec 2023 11:27:46 +0100 Subject: [PATCH 02/12] #2121: Simplify configuration of volumes --- docker-compose.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 7d9ffe0d76..9f774957a9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -69,16 +69,8 @@ version: '3.8' volumes: ubuntu-cpp: name: "${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-cache" - driver_opts: - type: "none" - o: "bind" - device: "${CACHE}${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-cache" alpine-cpp: name: "${ARCH}-alpine-${HOST_COMPILER}-${COMPILER}-cache" - driver_opts: - type: "none" - o: "bind" - device: "${CACHE}${ARCH}-alpine-${HOST_COMPILER}-${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 @@ -154,7 +146,7 @@ services: <<: [*ccache, *vtopts] volumes: &ubuntu-volumes - .:/vt:delegated - - ubuntu-cpp:/build:delegated + - ${CACHE}ubuntu-cpp:/build:delegated command: &vt-cpp-command > /bin/bash -c " /vt/ci/build_cpp.sh /vt /build && @@ -384,7 +376,7 @@ services: <<: [*ccache, *vtopts] volumes: &alpine-volumes - .:/vt:delegated - - alpine-cpp:/build:delegated + - ${CACHE}alpine-cpp:/build:delegated command: *vt-cpp-command ############################################################################## From 1e97bcaf28e607f12d89290e598c6f9ddaf4ce16 Mon Sep 17 00:00:00 2001 From: Arkadiusz Szczepkowicz Date: Fri, 8 Dec 2023 11:30:03 +0100 Subject: [PATCH 03/12] #2121: Remove create directory job from CI --- ci/azure/azure-clang-10-ubuntu-mpich.yml | 7 ------- ci/azure/azure-clang-11-ubuntu-mpich.yml | 7 ------- ci/azure/azure-clang-12-ubuntu-mpich.yml | 7 ------- ci/azure/azure-clang-13-ubuntu-mpich.yml | 7 ------- ci/azure/azure-clang-14-ubuntu-mpich.yml | 7 ------- ci/azure/azure-clang-9-ubuntu-mpich.yml | 7 ------- ci/azure/azure-clang-alpine-mpich.yml | 7 ------- ci/azure/azure-gcc-10-ubuntu-openmpi.yml | 7 ------- ci/azure/azure-gcc-11-ubuntu-mpich.yml | 7 ------- ci/azure/azure-gcc-12-ubuntu-mpich.yml | 7 ------- ci/azure/azure-gcc-8-ubuntu-mpich.yml | 7 ------- ci/azure/azure-gcc-9-ubuntu-mpich.yml | 7 ------- ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml | 7 ------- ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml | 7 ------- ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml | 7 ------- ci/azure/azure-nvidia-12-ubuntu-mpich.yml | 7 ------- scripts/workflow-azure-template.yml | 7 ------- 17 files changed, 119 deletions(-) diff --git a/ci/azure/azure-clang-10-ubuntu-mpich.yml b/ci/azure/azure-clang-10-ubuntu-mpich.yml index b86888fa45..158c3674ae 100644 --- a/ci/azure/azure-clang-10-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-10-ubuntu-mpich.yml @@ -127,13 +127,6 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" - - task: Bash@3 - displayName: Create directory for docker volume - condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') - inputs: - targetType: 'inline' - script: | - mkdir -p "$(build_root)" - task: DockerCompose@0 displayName: Pull container inputs: diff --git a/ci/azure/azure-clang-11-ubuntu-mpich.yml b/ci/azure/azure-clang-11-ubuntu-mpich.yml index dfee5a23f6..ce3d337b8f 100644 --- a/ci/azure/azure-clang-11-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-11-ubuntu-mpich.yml @@ -127,13 +127,6 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" - - task: Bash@3 - displayName: Create directory for docker volume - condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') - inputs: - targetType: 'inline' - script: | - mkdir -p "$(build_root)" - task: DockerCompose@0 displayName: Pull container inputs: diff --git a/ci/azure/azure-clang-12-ubuntu-mpich.yml b/ci/azure/azure-clang-12-ubuntu-mpich.yml index 51a0e42ec2..102af8d15c 100644 --- a/ci/azure/azure-clang-12-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-12-ubuntu-mpich.yml @@ -127,13 +127,6 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" - - task: Bash@3 - displayName: Create directory for docker volume - condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') - inputs: - targetType: 'inline' - script: | - mkdir -p "$(build_root)" - task: DockerCompose@0 displayName: Pull container inputs: diff --git a/ci/azure/azure-clang-13-ubuntu-mpich.yml b/ci/azure/azure-clang-13-ubuntu-mpich.yml index eb9f5cff81..390f04178a 100644 --- a/ci/azure/azure-clang-13-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-13-ubuntu-mpich.yml @@ -127,13 +127,6 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" - - task: Bash@3 - displayName: Create directory for docker volume - condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') - inputs: - targetType: 'inline' - script: | - mkdir -p "$(build_root)" - task: DockerCompose@0 displayName: Pull container inputs: diff --git a/ci/azure/azure-clang-14-ubuntu-mpich.yml b/ci/azure/azure-clang-14-ubuntu-mpich.yml index 5e8d13d013..4620d628b0 100644 --- a/ci/azure/azure-clang-14-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-14-ubuntu-mpich.yml @@ -127,13 +127,6 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" - - task: Bash@3 - displayName: Create directory for docker volume - condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') - inputs: - targetType: 'inline' - script: | - mkdir -p "$(build_root)" - task: DockerCompose@0 displayName: Pull container inputs: diff --git a/ci/azure/azure-clang-9-ubuntu-mpich.yml b/ci/azure/azure-clang-9-ubuntu-mpich.yml index 5fe8bdb520..4219a637e0 100644 --- a/ci/azure/azure-clang-9-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-9-ubuntu-mpich.yml @@ -127,13 +127,6 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" - - task: Bash@3 - displayName: Create directory for docker volume - condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') - inputs: - targetType: 'inline' - script: | - mkdir -p "$(build_root)" - task: DockerCompose@0 displayName: Pull container inputs: diff --git a/ci/azure/azure-clang-alpine-mpich.yml b/ci/azure/azure-clang-alpine-mpich.yml index 690136e7e0..8a76770e33 100644 --- a/ci/azure/azure-clang-alpine-mpich.yml +++ b/ci/azure/azure-clang-alpine-mpich.yml @@ -127,13 +127,6 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" - - task: Bash@3 - displayName: Create directory for docker volume - condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') - inputs: - targetType: 'inline' - script: | - mkdir -p "$(build_root)" - task: DockerCompose@0 displayName: Pull container inputs: diff --git a/ci/azure/azure-gcc-10-ubuntu-openmpi.yml b/ci/azure/azure-gcc-10-ubuntu-openmpi.yml index bd43f8d8d4..e29721e78d 100644 --- a/ci/azure/azure-gcc-10-ubuntu-openmpi.yml +++ b/ci/azure/azure-gcc-10-ubuntu-openmpi.yml @@ -127,13 +127,6 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" - - task: Bash@3 - displayName: Create directory for docker volume - condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') - inputs: - targetType: 'inline' - script: | - mkdir -p "$(build_root)" - task: DockerCompose@0 displayName: Pull container inputs: diff --git a/ci/azure/azure-gcc-11-ubuntu-mpich.yml b/ci/azure/azure-gcc-11-ubuntu-mpich.yml index c4771dea0b..e11fec7232 100644 --- a/ci/azure/azure-gcc-11-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-11-ubuntu-mpich.yml @@ -127,13 +127,6 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" - - task: Bash@3 - displayName: Create directory for docker volume - condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') - inputs: - targetType: 'inline' - script: | - mkdir -p "$(build_root)" - task: DockerCompose@0 displayName: Pull container inputs: diff --git a/ci/azure/azure-gcc-12-ubuntu-mpich.yml b/ci/azure/azure-gcc-12-ubuntu-mpich.yml index 6396f825c6..2187c26b7c 100644 --- a/ci/azure/azure-gcc-12-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-12-ubuntu-mpich.yml @@ -127,13 +127,6 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" - - task: Bash@3 - displayName: Create directory for docker volume - condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') - inputs: - targetType: 'inline' - script: | - mkdir -p "$(build_root)" - task: DockerCompose@0 displayName: Pull container inputs: diff --git a/ci/azure/azure-gcc-8-ubuntu-mpich.yml b/ci/azure/azure-gcc-8-ubuntu-mpich.yml index 904a607bd3..4bb75fb294 100644 --- a/ci/azure/azure-gcc-8-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-8-ubuntu-mpich.yml @@ -127,13 +127,6 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" - - task: Bash@3 - displayName: Create directory for docker volume - condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') - inputs: - targetType: 'inline' - script: | - mkdir -p "$(build_root)" - task: DockerCompose@0 displayName: Pull container inputs: diff --git a/ci/azure/azure-gcc-9-ubuntu-mpich.yml b/ci/azure/azure-gcc-9-ubuntu-mpich.yml index eadf493cd1..ae2db9107c 100644 --- a/ci/azure/azure-gcc-9-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-9-ubuntu-mpich.yml @@ -127,13 +127,6 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" - - task: Bash@3 - displayName: Create directory for docker volume - condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') - inputs: - targetType: 'inline' - script: | - mkdir -p "$(build_root)" - task: DockerCompose@0 displayName: Pull container inputs: diff --git a/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml b/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml index 39ae955260..4390ba7cbb 100644 --- a/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml +++ b/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml @@ -127,13 +127,6 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" - - task: Bash@3 - displayName: Create directory for docker volume - condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') - inputs: - targetType: 'inline' - script: | - mkdir -p "$(build_root)" - task: DockerCompose@0 displayName: Pull container inputs: diff --git a/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml b/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml index 60561fae16..3e8ebcd202 100644 --- a/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml +++ b/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml @@ -127,13 +127,6 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" - - task: Bash@3 - displayName: Create directory for docker volume - condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') - inputs: - targetType: 'inline' - script: | - mkdir -p "$(build_root)" - task: DockerCompose@0 displayName: Pull container inputs: diff --git a/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml b/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml index 98016ed7dd..1f4a0d3660 100644 --- a/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml +++ b/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml @@ -127,13 +127,6 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" - - task: Bash@3 - displayName: Create directory for docker volume - condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') - inputs: - targetType: 'inline' - script: | - mkdir -p "$(build_root)" - task: DockerCompose@0 displayName: Pull container inputs: diff --git a/ci/azure/azure-nvidia-12-ubuntu-mpich.yml b/ci/azure/azure-nvidia-12-ubuntu-mpich.yml index 045618e2a9..43465d1794 100644 --- a/ci/azure/azure-nvidia-12-ubuntu-mpich.yml +++ b/ci/azure/azure-nvidia-12-ubuntu-mpich.yml @@ -127,13 +127,6 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" - - task: Bash@3 - displayName: Create directory for docker volume - condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') - inputs: - targetType: 'inline' - script: | - mkdir -p "$(build_root)" - task: DockerCompose@0 displayName: Pull container inputs: diff --git a/scripts/workflow-azure-template.yml b/scripts/workflow-azure-template.yml index f34518669a..aa4a566cb2 100644 --- a/scripts/workflow-azure-template.yml +++ b/scripts/workflow-azure-template.yml @@ -115,13 +115,6 @@ stages: script: | val=$(./scripts/check_containers.sh) echo "##vso[task.setvariable variable=compose_command]$val" - - task: Bash@3 - displayName: Create directory for docker volume - condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues') - inputs: - targetType: 'inline' - script: | - mkdir -p "$(build_root)" - task: DockerCompose@0 displayName: Pull container inputs: From 936e68c7201c11dc23d00952f1782042b33b0c94 Mon Sep 17 00:00:00 2001 From: Arkadiusz Szczepkowicz Date: Fri, 8 Dec 2023 11:31:10 +0100 Subject: [PATCH 04/12] #2121: Temporary enable all CI pipelines --- ci/azure/azure-clang-10-ubuntu-mpich.yml | 1 + ci/azure/azure-clang-11-ubuntu-mpich.yml | 1 + ci/azure/azure-clang-12-ubuntu-mpich.yml | 1 + ci/azure/azure-clang-13-ubuntu-mpich.yml | 1 + ci/azure/azure-clang-14-ubuntu-mpich.yml | 1 + ci/azure/azure-clang-9-ubuntu-mpich.yml | 1 + ci/azure/azure-clang-alpine-mpich.yml | 1 + ci/azure/azure-gcc-10-ubuntu-openmpi.yml | 1 + ci/azure/azure-gcc-11-ubuntu-mpich.yml | 1 + ci/azure/azure-gcc-12-ubuntu-mpich.yml | 1 + ci/azure/azure-gcc-8-ubuntu-mpich.yml | 1 + ci/azure/azure-gcc-9-ubuntu-mpich.yml | 1 + ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml | 1 + ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml | 1 + ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml | 1 + ci/azure/azure-nvidia-12-ubuntu-mpich.yml | 1 + scripts/workflows-azure.ini | 2 +- 17 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ci/azure/azure-clang-10-ubuntu-mpich.yml b/ci/azure/azure-clang-10-ubuntu-mpich.yml index 158c3674ae..5e8fa16539 100644 --- a/ci/azure/azure-clang-10-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-10-ubuntu-mpich.yml @@ -9,6 +9,7 @@ trigger: include: - develop - main + - 2121-generalize-named-volumes pr: drafts: false diff --git a/ci/azure/azure-clang-11-ubuntu-mpich.yml b/ci/azure/azure-clang-11-ubuntu-mpich.yml index ce3d337b8f..61d31dca49 100644 --- a/ci/azure/azure-clang-11-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-11-ubuntu-mpich.yml @@ -9,6 +9,7 @@ trigger: include: - develop - main + - 2121-generalize-named-volumes pr: drafts: false diff --git a/ci/azure/azure-clang-12-ubuntu-mpich.yml b/ci/azure/azure-clang-12-ubuntu-mpich.yml index 102af8d15c..66a866a2cf 100644 --- a/ci/azure/azure-clang-12-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-12-ubuntu-mpich.yml @@ -9,6 +9,7 @@ trigger: include: - develop - main + - 2121-generalize-named-volumes pr: drafts: false diff --git a/ci/azure/azure-clang-13-ubuntu-mpich.yml b/ci/azure/azure-clang-13-ubuntu-mpich.yml index 390f04178a..4effcd3e10 100644 --- a/ci/azure/azure-clang-13-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-13-ubuntu-mpich.yml @@ -9,6 +9,7 @@ trigger: include: - develop - main + - 2121-generalize-named-volumes pr: drafts: false diff --git a/ci/azure/azure-clang-14-ubuntu-mpich.yml b/ci/azure/azure-clang-14-ubuntu-mpich.yml index 4620d628b0..b4deec1c82 100644 --- a/ci/azure/azure-clang-14-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-14-ubuntu-mpich.yml @@ -9,6 +9,7 @@ trigger: include: - develop - main + - 2121-generalize-named-volumes pr: drafts: false diff --git a/ci/azure/azure-clang-9-ubuntu-mpich.yml b/ci/azure/azure-clang-9-ubuntu-mpich.yml index 4219a637e0..1fb620cf0e 100644 --- a/ci/azure/azure-clang-9-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-9-ubuntu-mpich.yml @@ -9,6 +9,7 @@ trigger: include: - develop - main + - 2121-generalize-named-volumes pr: drafts: false diff --git a/ci/azure/azure-clang-alpine-mpich.yml b/ci/azure/azure-clang-alpine-mpich.yml index 8a76770e33..b244571880 100644 --- a/ci/azure/azure-clang-alpine-mpich.yml +++ b/ci/azure/azure-clang-alpine-mpich.yml @@ -9,6 +9,7 @@ trigger: include: - develop - main + - 2121-generalize-named-volumes pr: drafts: false diff --git a/ci/azure/azure-gcc-10-ubuntu-openmpi.yml b/ci/azure/azure-gcc-10-ubuntu-openmpi.yml index e29721e78d..c76e389bc5 100644 --- a/ci/azure/azure-gcc-10-ubuntu-openmpi.yml +++ b/ci/azure/azure-gcc-10-ubuntu-openmpi.yml @@ -9,6 +9,7 @@ trigger: include: - develop - main + - 2121-generalize-named-volumes pr: drafts: false diff --git a/ci/azure/azure-gcc-11-ubuntu-mpich.yml b/ci/azure/azure-gcc-11-ubuntu-mpich.yml index e11fec7232..ee53374736 100644 --- a/ci/azure/azure-gcc-11-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-11-ubuntu-mpich.yml @@ -9,6 +9,7 @@ trigger: include: - develop - main + - 2121-generalize-named-volumes pr: drafts: false diff --git a/ci/azure/azure-gcc-12-ubuntu-mpich.yml b/ci/azure/azure-gcc-12-ubuntu-mpich.yml index 2187c26b7c..3c3b2023ad 100644 --- a/ci/azure/azure-gcc-12-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-12-ubuntu-mpich.yml @@ -9,6 +9,7 @@ trigger: include: - develop - main + - 2121-generalize-named-volumes pr: drafts: true diff --git a/ci/azure/azure-gcc-8-ubuntu-mpich.yml b/ci/azure/azure-gcc-8-ubuntu-mpich.yml index 4bb75fb294..92537a2548 100644 --- a/ci/azure/azure-gcc-8-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-8-ubuntu-mpich.yml @@ -9,6 +9,7 @@ trigger: include: - develop - main + - 2121-generalize-named-volumes pr: drafts: false diff --git a/ci/azure/azure-gcc-9-ubuntu-mpich.yml b/ci/azure/azure-gcc-9-ubuntu-mpich.yml index ae2db9107c..07e9591fdf 100644 --- a/ci/azure/azure-gcc-9-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-9-ubuntu-mpich.yml @@ -9,6 +9,7 @@ trigger: include: - develop - main + - 2121-generalize-named-volumes pr: drafts: false diff --git a/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml b/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml index 4390ba7cbb..ef89e5fe6d 100644 --- a/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml +++ b/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml @@ -9,6 +9,7 @@ trigger: include: - develop - main + - 2121-generalize-named-volumes pr: drafts: false diff --git a/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml b/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml index 3e8ebcd202..1b3ba7e742 100644 --- a/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml +++ b/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml @@ -9,6 +9,7 @@ trigger: include: - develop - main + - 2121-generalize-named-volumes pr: drafts: false diff --git a/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml b/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml index 1f4a0d3660..5672c249c5 100644 --- a/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml +++ b/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml @@ -9,6 +9,7 @@ trigger: include: - develop - main + - 2121-generalize-named-volumes pr: drafts: false diff --git a/ci/azure/azure-nvidia-12-ubuntu-mpich.yml b/ci/azure/azure-nvidia-12-ubuntu-mpich.yml index 43465d1794..41d99b3ae5 100644 --- a/ci/azure/azure-nvidia-12-ubuntu-mpich.yml +++ b/ci/azure/azure-nvidia-12-ubuntu-mpich.yml @@ -9,6 +9,7 @@ trigger: include: - develop - main + - 2121-generalize-named-volumes pr: drafts: false diff --git a/scripts/workflows-azure.ini b/scripts/workflows-azure.ini index 0588b8a7f2..24f534e708 100644 --- a/scripts/workflows-azure.ini +++ b/scripts/workflows-azure.ini @@ -29,7 +29,7 @@ linux = ubuntu cache_dir = "~/.local/cache/" cache_name = "[% linux %]-[% compiler %]-cache" docker_target = "[% linux %]-cpp-clean" -triggers = "trigger:\\n branches:\\n include:\\n - develop\\n - main" +triggers = "trigger:\\n branches:\\n include:\\n - develop\\n - main\\n - 2121-generalize-named-volumes" warning = "###############################################################################\\n############## Warning this is a generated file---do not modify ###############\\n###############################################################################" job_name = build workflow_runs_on = "vmImage: 'ubuntu-22.04'" From 9b834f7eedc950f0d4b19378320a029dceef5212 Mon Sep 17 00:00:00 2001 From: Arkadiusz Szczepkowicz Date: Fri, 8 Dec 2023 12:10:06 +0100 Subject: [PATCH 05/12] #2121: Add volume name suffix to the cache path --- .env | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.env b/.env index 4000fab13d..fcf28dcf0e 100644 --- a/.env +++ b/.env @@ -6,5 +6,9 @@ COMPILER=gcc-12 HOST_COMPILER=gcc-12 COMPILER_TYPE=gnu PROXY= -CACHE= TOKEN= +# Change this path to save the volume content on disk. +CUSTOM_CACHE_PATH= + +VOLUME="${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-cache" +CACHE="${CUSTOM_CACHE_PATH:+${CUSTOM_CACHE_PATH}${VOLUME}/}" From abf25f924557625aefad1ecf4d98709ab713cf80 Mon Sep 17 00:00:00 2001 From: Arkadiusz Szczepkowicz Date: Fri, 8 Dec 2023 12:16:36 +0100 Subject: [PATCH 06/12] #2121: Add volume identifier suffix to build_root --- ci/azure/azure-clang-10-ubuntu-mpich.yml | 2 +- ci/azure/azure-clang-11-ubuntu-mpich.yml | 2 +- ci/azure/azure-clang-12-ubuntu-mpich.yml | 2 +- ci/azure/azure-clang-13-ubuntu-mpich.yml | 2 +- ci/azure/azure-clang-14-ubuntu-mpich.yml | 2 +- ci/azure/azure-clang-9-ubuntu-mpich.yml | 2 +- ci/azure/azure-clang-alpine-mpich.yml | 2 +- ci/azure/azure-gcc-10-ubuntu-openmpi.yml | 2 +- ci/azure/azure-gcc-11-ubuntu-mpich.yml | 2 +- ci/azure/azure-gcc-12-ubuntu-mpich.yml | 2 +- ci/azure/azure-gcc-8-ubuntu-mpich.yml | 2 +- ci/azure/azure-gcc-9-ubuntu-mpich.yml | 2 +- ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml | 2 +- ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml | 2 +- ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml | 2 +- ci/azure/azure-nvidia-12-ubuntu-mpich.yml | 2 +- scripts/workflows-azure.ini | 4 ++-- 17 files changed, 18 insertions(+), 18 deletions(-) diff --git a/ci/azure/azure-clang-10-ubuntu-mpich.yml b/ci/azure/azure-clang-10-ubuntu-mpich.yml index 5e8fa16539..cf22992dc3 100644 --- a/ci/azure/azure-clang-10-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-10-ubuntu-mpich.yml @@ -58,7 +58,7 @@ variables: TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-clang-10-cache - build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache" + build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/ubuntu-cpp" TS: 0 TS_YEAR: 0 TS_MONTH: 0 diff --git a/ci/azure/azure-clang-11-ubuntu-mpich.yml b/ci/azure/azure-clang-11-ubuntu-mpich.yml index 61d31dca49..a64f5fe135 100644 --- a/ci/azure/azure-clang-11-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-11-ubuntu-mpich.yml @@ -58,7 +58,7 @@ variables: TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-clang-11-cache - build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache" + build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/ubuntu-cpp" TS: 0 TS_YEAR: 0 TS_MONTH: 0 diff --git a/ci/azure/azure-clang-12-ubuntu-mpich.yml b/ci/azure/azure-clang-12-ubuntu-mpich.yml index 66a866a2cf..a9a0df44c7 100644 --- a/ci/azure/azure-clang-12-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-12-ubuntu-mpich.yml @@ -58,7 +58,7 @@ variables: TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-clang-12-cache - build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache" + build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/ubuntu-cpp" TS: 0 TS_YEAR: 0 TS_MONTH: 0 diff --git a/ci/azure/azure-clang-13-ubuntu-mpich.yml b/ci/azure/azure-clang-13-ubuntu-mpich.yml index 4effcd3e10..ebe868ba7d 100644 --- a/ci/azure/azure-clang-13-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-13-ubuntu-mpich.yml @@ -58,7 +58,7 @@ variables: TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-clang-13-cache - build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache" + build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/ubuntu-cpp" TS: 0 TS_YEAR: 0 TS_MONTH: 0 diff --git a/ci/azure/azure-clang-14-ubuntu-mpich.yml b/ci/azure/azure-clang-14-ubuntu-mpich.yml index b4deec1c82..c8d95117b0 100644 --- a/ci/azure/azure-clang-14-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-14-ubuntu-mpich.yml @@ -58,7 +58,7 @@ variables: TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-clang-14-cache - build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache" + build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/ubuntu-cpp" TS: 0 TS_YEAR: 0 TS_MONTH: 0 diff --git a/ci/azure/azure-clang-9-ubuntu-mpich.yml b/ci/azure/azure-clang-9-ubuntu-mpich.yml index 1fb620cf0e..9eb247d7e4 100644 --- a/ci/azure/azure-clang-9-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-9-ubuntu-mpich.yml @@ -58,7 +58,7 @@ variables: TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-clang-9-cache - build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache" + build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/ubuntu-cpp" TS: 0 TS_YEAR: 0 TS_MONTH: 0 diff --git a/ci/azure/azure-clang-alpine-mpich.yml b/ci/azure/azure-clang-alpine-mpich.yml index b244571880..a929d9424c 100644 --- a/ci/azure/azure-clang-alpine-mpich.yml +++ b/ci/azure/azure-clang-alpine-mpich.yml @@ -58,7 +58,7 @@ variables: TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: alpine-clang-13-cache - build_root: "$(CACHE)$(ARCH)-alpine-$(HOST_COMPILER)-$(COMPILER)-cache" + build_root: "$(CACHE)$(ARCH)-alpine-$(HOST_COMPILER)-$(COMPILER)-cache/alpine-cpp" TS: 0 TS_YEAR: 0 TS_MONTH: 0 diff --git a/ci/azure/azure-gcc-10-ubuntu-openmpi.yml b/ci/azure/azure-gcc-10-ubuntu-openmpi.yml index c76e389bc5..6690938aa9 100644 --- a/ci/azure/azure-gcc-10-ubuntu-openmpi.yml +++ b/ci/azure/azure-gcc-10-ubuntu-openmpi.yml @@ -58,7 +58,7 @@ variables: TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-gcc-10-cache - build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache" + build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/ubuntu-cpp" TS: 0 TS_YEAR: 0 TS_MONTH: 0 diff --git a/ci/azure/azure-gcc-11-ubuntu-mpich.yml b/ci/azure/azure-gcc-11-ubuntu-mpich.yml index ee53374736..59fc2848ac 100644 --- a/ci/azure/azure-gcc-11-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-11-ubuntu-mpich.yml @@ -58,7 +58,7 @@ variables: TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-gcc-11-cache - build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache" + build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/ubuntu-cpp" TS: 0 TS_YEAR: 0 TS_MONTH: 0 diff --git a/ci/azure/azure-gcc-12-ubuntu-mpich.yml b/ci/azure/azure-gcc-12-ubuntu-mpich.yml index 3c3b2023ad..0b40230462 100644 --- a/ci/azure/azure-gcc-12-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-12-ubuntu-mpich.yml @@ -58,7 +58,7 @@ variables: TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-gcc-12-cache - build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache" + build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/ubuntu-cpp" TS: 0 TS_YEAR: 0 TS_MONTH: 0 diff --git a/ci/azure/azure-gcc-8-ubuntu-mpich.yml b/ci/azure/azure-gcc-8-ubuntu-mpich.yml index 92537a2548..2dd3a5bfdf 100644 --- a/ci/azure/azure-gcc-8-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-8-ubuntu-mpich.yml @@ -58,7 +58,7 @@ variables: TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-gcc-8-cache - build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache" + build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/ubuntu-cpp" TS: 0 TS_YEAR: 0 TS_MONTH: 0 diff --git a/ci/azure/azure-gcc-9-ubuntu-mpich.yml b/ci/azure/azure-gcc-9-ubuntu-mpich.yml index 07e9591fdf..f497705d90 100644 --- a/ci/azure/azure-gcc-9-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-9-ubuntu-mpich.yml @@ -58,7 +58,7 @@ variables: TEST_LB_SCHEMA: 1 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-gcc-9-cache - build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache" + build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/ubuntu-cpp" TS: 0 TS_YEAR: 0 TS_MONTH: 0 diff --git a/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml b/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml index ef89e5fe6d..d563c18902 100644 --- a/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml +++ b/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml @@ -58,7 +58,7 @@ variables: TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-intel-oneapi-icpc-cache - build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache" + build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/ubuntu-cpp" TS: 0 TS_YEAR: 0 TS_MONTH: 0 diff --git a/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml b/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml index 1b3ba7e742..b6fada5260 100644 --- a/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml +++ b/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml @@ -58,7 +58,7 @@ variables: TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-intel-oneapi-icpx-cache - build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache" + build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/ubuntu-cpp" TS: 0 TS_YEAR: 0 TS_MONTH: 0 diff --git a/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml b/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml index 5672c249c5..a654948046 100644 --- a/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml +++ b/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml @@ -58,7 +58,7 @@ variables: TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-nvidia-11.2-cache - build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache" + build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/ubuntu-cpp" TS: 0 TS_YEAR: 0 TS_MONTH: 0 diff --git a/ci/azure/azure-nvidia-12-ubuntu-mpich.yml b/ci/azure/azure-nvidia-12-ubuntu-mpich.yml index 41d99b3ae5..846bbf4ed7 100644 --- a/ci/azure/azure-nvidia-12-ubuntu-mpich.yml +++ b/ci/azure/azure-nvidia-12-ubuntu-mpich.yml @@ -58,7 +58,7 @@ variables: TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-nvidia-12-cache - build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache" + build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/ubuntu-cpp" TS: 0 TS_YEAR: 0 TS_MONTH: 0 diff --git a/scripts/workflows-azure.ini b/scripts/workflows-azure.ini index 24f534e708..bcf8ef2586 100644 --- a/scripts/workflows-azure.ini +++ b/scripts/workflows-azure.ini @@ -33,7 +33,7 @@ triggers = "trigger:\\n branches:\\n include:\\n - develop\\n - ma warning = "###############################################################################\\n############## Warning this is a generated file---do not modify ###############\\n###############################################################################" job_name = build workflow_runs_on = "vmImage: 'ubuntu-22.04'" -build_root = $(ARCH)-[% linux %]-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache +build_root = $(ARCH)-[% linux %]-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/ubuntu-cpp linux_env = " UBUNTU: [% distro %]" vt_diagnostics = 1 pr_pattern = "pr:\\n drafts: false\\n autoCancel: true\\n branches:\\n include:\\n - '*'\\n" @@ -147,7 +147,7 @@ is_ubuntu = 0 linux = alpine linux_env ="" output_name = ci/azure/azure-clang-alpine-mpich.yml -build_root = $(ARCH)-[% linux %]-$(HOST_COMPILER)-$(COMPILER)-cache +build_root = $(ARCH)-[% linux %]-$(HOST_COMPILER)-$(COMPILER)-cache/alpine-cpp vt_production_build = 1 [PR-tests-clang-9] From 925501c786e51568f72a28be89c5e171aeccb366 Mon Sep 17 00:00:00 2001 From: Arkadiusz Szczepkowicz Date: Fri, 8 Dec 2023 17:24:08 +0100 Subject: [PATCH 07/12] #2121: Reorder cache variables in .env file --- .env | 4 ++-- docker-compose.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.env b/.env index fcf28dcf0e..72f3f94372 100644 --- a/.env +++ b/.env @@ -8,7 +8,7 @@ COMPILER_TYPE=gnu PROXY= TOKEN= # Change this path to save the volume content on disk. -CUSTOM_CACHE_PATH= +CACHE= VOLUME="${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-cache" -CACHE="${CUSTOM_CACHE_PATH:+${CUSTOM_CACHE_PATH}${VOLUME}/}" +FULL_CACHE_PATH="${CACHE:+${CACHE}${VOLUME}/}" diff --git a/docker-compose.yml b/docker-compose.yml index 9f774957a9..df044c10d9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -146,7 +146,7 @@ services: <<: [*ccache, *vtopts] volumes: &ubuntu-volumes - .:/vt:delegated - - ${CACHE}ubuntu-cpp:/build:delegated + - ${FULL_CACHE_PATH}ubuntu-cpp:/build:delegated command: &vt-cpp-command > /bin/bash -c " /vt/ci/build_cpp.sh /vt /build && @@ -376,7 +376,7 @@ services: <<: [*ccache, *vtopts] volumes: &alpine-volumes - .:/vt:delegated - - ${CACHE}alpine-cpp:/build:delegated + - ${FULL_CACHE_PATH}alpine-cpp:/build:delegated command: *vt-cpp-command ############################################################################## From c3cbe0d3d7c1cd118bbe882c269a64ebc1e681a2 Mon Sep 17 00:00:00 2001 From: Arkadiusz Szczepkowicz Date: Fri, 8 Dec 2023 17:42:52 +0100 Subject: [PATCH 08/12] #2121: Simplify path deduction --- .env | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.env b/.env index 72f3f94372..74f1c47be4 100644 --- a/.env +++ b/.env @@ -11,4 +11,5 @@ TOKEN= CACHE= VOLUME="${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-cache" -FULL_CACHE_PATH="${CACHE:+${CACHE}${VOLUME}/}" +TMP="${CACHE}${VOLUME}/" +FULL_CACHE_PATH="${CACHE:+$TMP}" From 5df31534d0deaf3e8caa4aae36764b0584be890b Mon Sep 17 00:00:00 2001 From: Arkadiusz Szczepkowicz Date: Thu, 14 Dec 2023 17:13:15 +0100 Subject: [PATCH 09/12] #2121: Update bash expansion in .env file --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index 74f1c47be4..03cab594d5 100644 --- a/.env +++ b/.env @@ -12,4 +12,4 @@ CACHE= VOLUME="${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-cache" TMP="${CACHE}${VOLUME}/" -FULL_CACHE_PATH="${CACHE:+$TMP}" +FULL_CACHE_PATH="${CACHE:+${TMP}}" From c30bb4bdefeedcd1676e58c6cbbaebc5fe70de59 Mon Sep 17 00:00:00 2001 From: Arkadiusz Szczepkowicz Date: Thu, 14 Dec 2023 18:06:00 +0100 Subject: [PATCH 10/12] #2121: Use build_root variable instead of CACHE --- .env | 9 +++++---- ci/azure/azure-clang-10-ubuntu-mpich.yml | 2 +- ci/azure/azure-clang-11-ubuntu-mpich.yml | 2 +- ci/azure/azure-clang-12-ubuntu-mpich.yml | 2 +- ci/azure/azure-clang-13-ubuntu-mpich.yml | 2 +- ci/azure/azure-clang-14-ubuntu-mpich.yml | 2 +- ci/azure/azure-clang-9-ubuntu-mpich.yml | 2 +- ci/azure/azure-clang-alpine-mpich.yml | 2 +- ci/azure/azure-gcc-10-ubuntu-openmpi.yml | 2 +- ci/azure/azure-gcc-11-ubuntu-mpich.yml | 2 +- ci/azure/azure-gcc-12-ubuntu-mpich.yml | 2 +- ci/azure/azure-gcc-8-ubuntu-mpich.yml | 2 +- ci/azure/azure-gcc-9-ubuntu-mpich.yml | 2 +- ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml | 2 +- ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml | 2 +- ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml | 2 +- ci/azure/azure-nvidia-12-ubuntu-mpich.yml | 2 +- docker-compose.yml | 4 ++-- scripts/workflows-azure.ini | 4 ++-- 19 files changed, 25 insertions(+), 24 deletions(-) diff --git a/.env b/.env index 03cab594d5..1127732530 100644 --- a/.env +++ b/.env @@ -8,8 +8,9 @@ COMPILER_TYPE=gnu PROXY= TOKEN= # Change this path to save the volume content on disk. -CACHE= +#CACHE= +build_root= -VOLUME="${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-cache" -TMP="${CACHE}${VOLUME}/" -FULL_CACHE_PATH="${CACHE:+${TMP}}" +#VOLUME="${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-cache" +#TMP="${CACHE}${VOLUME}/" +#FULL_CACHE_PATH="${CACHE+${TMP}}" diff --git a/ci/azure/azure-clang-10-ubuntu-mpich.yml b/ci/azure/azure-clang-10-ubuntu-mpich.yml index cf22992dc3..5e8fa16539 100644 --- a/ci/azure/azure-clang-10-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-10-ubuntu-mpich.yml @@ -58,7 +58,7 @@ variables: TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-clang-10-cache - build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/ubuntu-cpp" + build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache" TS: 0 TS_YEAR: 0 TS_MONTH: 0 diff --git a/ci/azure/azure-clang-11-ubuntu-mpich.yml b/ci/azure/azure-clang-11-ubuntu-mpich.yml index a64f5fe135..61d31dca49 100644 --- a/ci/azure/azure-clang-11-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-11-ubuntu-mpich.yml @@ -58,7 +58,7 @@ variables: TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-clang-11-cache - build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/ubuntu-cpp" + build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache" TS: 0 TS_YEAR: 0 TS_MONTH: 0 diff --git a/ci/azure/azure-clang-12-ubuntu-mpich.yml b/ci/azure/azure-clang-12-ubuntu-mpich.yml index a9a0df44c7..66a866a2cf 100644 --- a/ci/azure/azure-clang-12-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-12-ubuntu-mpich.yml @@ -58,7 +58,7 @@ variables: TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-clang-12-cache - build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/ubuntu-cpp" + build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache" TS: 0 TS_YEAR: 0 TS_MONTH: 0 diff --git a/ci/azure/azure-clang-13-ubuntu-mpich.yml b/ci/azure/azure-clang-13-ubuntu-mpich.yml index ebe868ba7d..4effcd3e10 100644 --- a/ci/azure/azure-clang-13-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-13-ubuntu-mpich.yml @@ -58,7 +58,7 @@ variables: TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-clang-13-cache - build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/ubuntu-cpp" + build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache" TS: 0 TS_YEAR: 0 TS_MONTH: 0 diff --git a/ci/azure/azure-clang-14-ubuntu-mpich.yml b/ci/azure/azure-clang-14-ubuntu-mpich.yml index c8d95117b0..b4deec1c82 100644 --- a/ci/azure/azure-clang-14-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-14-ubuntu-mpich.yml @@ -58,7 +58,7 @@ variables: TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-clang-14-cache - build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/ubuntu-cpp" + build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache" TS: 0 TS_YEAR: 0 TS_MONTH: 0 diff --git a/ci/azure/azure-clang-9-ubuntu-mpich.yml b/ci/azure/azure-clang-9-ubuntu-mpich.yml index 9eb247d7e4..1fb620cf0e 100644 --- a/ci/azure/azure-clang-9-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-9-ubuntu-mpich.yml @@ -58,7 +58,7 @@ variables: TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-clang-9-cache - build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/ubuntu-cpp" + build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache" TS: 0 TS_YEAR: 0 TS_MONTH: 0 diff --git a/ci/azure/azure-clang-alpine-mpich.yml b/ci/azure/azure-clang-alpine-mpich.yml index a929d9424c..b244571880 100644 --- a/ci/azure/azure-clang-alpine-mpich.yml +++ b/ci/azure/azure-clang-alpine-mpich.yml @@ -58,7 +58,7 @@ variables: TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: alpine-clang-13-cache - build_root: "$(CACHE)$(ARCH)-alpine-$(HOST_COMPILER)-$(COMPILER)-cache/alpine-cpp" + build_root: "$(CACHE)$(ARCH)-alpine-$(HOST_COMPILER)-$(COMPILER)-cache" TS: 0 TS_YEAR: 0 TS_MONTH: 0 diff --git a/ci/azure/azure-gcc-10-ubuntu-openmpi.yml b/ci/azure/azure-gcc-10-ubuntu-openmpi.yml index 6690938aa9..c76e389bc5 100644 --- a/ci/azure/azure-gcc-10-ubuntu-openmpi.yml +++ b/ci/azure/azure-gcc-10-ubuntu-openmpi.yml @@ -58,7 +58,7 @@ variables: TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-gcc-10-cache - build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/ubuntu-cpp" + build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache" TS: 0 TS_YEAR: 0 TS_MONTH: 0 diff --git a/ci/azure/azure-gcc-11-ubuntu-mpich.yml b/ci/azure/azure-gcc-11-ubuntu-mpich.yml index 59fc2848ac..ee53374736 100644 --- a/ci/azure/azure-gcc-11-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-11-ubuntu-mpich.yml @@ -58,7 +58,7 @@ variables: TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-gcc-11-cache - build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/ubuntu-cpp" + build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache" TS: 0 TS_YEAR: 0 TS_MONTH: 0 diff --git a/ci/azure/azure-gcc-12-ubuntu-mpich.yml b/ci/azure/azure-gcc-12-ubuntu-mpich.yml index 0b40230462..3c3b2023ad 100644 --- a/ci/azure/azure-gcc-12-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-12-ubuntu-mpich.yml @@ -58,7 +58,7 @@ variables: TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-gcc-12-cache - build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/ubuntu-cpp" + build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache" TS: 0 TS_YEAR: 0 TS_MONTH: 0 diff --git a/ci/azure/azure-gcc-8-ubuntu-mpich.yml b/ci/azure/azure-gcc-8-ubuntu-mpich.yml index 2dd3a5bfdf..92537a2548 100644 --- a/ci/azure/azure-gcc-8-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-8-ubuntu-mpich.yml @@ -58,7 +58,7 @@ variables: TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-gcc-8-cache - build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/ubuntu-cpp" + build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache" TS: 0 TS_YEAR: 0 TS_MONTH: 0 diff --git a/ci/azure/azure-gcc-9-ubuntu-mpich.yml b/ci/azure/azure-gcc-9-ubuntu-mpich.yml index f497705d90..07e9591fdf 100644 --- a/ci/azure/azure-gcc-9-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-9-ubuntu-mpich.yml @@ -58,7 +58,7 @@ variables: TEST_LB_SCHEMA: 1 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-gcc-9-cache - build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/ubuntu-cpp" + build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache" TS: 0 TS_YEAR: 0 TS_MONTH: 0 diff --git a/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml b/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml index d563c18902..ef89e5fe6d 100644 --- a/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml +++ b/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml @@ -58,7 +58,7 @@ variables: TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-intel-oneapi-icpc-cache - build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/ubuntu-cpp" + build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache" TS: 0 TS_YEAR: 0 TS_MONTH: 0 diff --git a/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml b/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml index b6fada5260..1b3ba7e742 100644 --- a/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml +++ b/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml @@ -58,7 +58,7 @@ variables: TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-intel-oneapi-icpx-cache - build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/ubuntu-cpp" + build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache" TS: 0 TS_YEAR: 0 TS_MONTH: 0 diff --git a/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml b/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml index a654948046..5672c249c5 100644 --- a/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml +++ b/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml @@ -58,7 +58,7 @@ variables: TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-nvidia-11.2-cache - build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/ubuntu-cpp" + build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache" TS: 0 TS_YEAR: 0 TS_MONTH: 0 diff --git a/ci/azure/azure-nvidia-12-ubuntu-mpich.yml b/ci/azure/azure-nvidia-12-ubuntu-mpich.yml index 846bbf4ed7..41d99b3ae5 100644 --- a/ci/azure/azure-nvidia-12-ubuntu-mpich.yml +++ b/ci/azure/azure-nvidia-12-ubuntu-mpich.yml @@ -58,7 +58,7 @@ variables: TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-nvidia-12-cache - build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/ubuntu-cpp" + build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache" TS: 0 TS_YEAR: 0 TS_MONTH: 0 diff --git a/docker-compose.yml b/docker-compose.yml index df044c10d9..c88485c28f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -146,7 +146,7 @@ services: <<: [*ccache, *vtopts] volumes: &ubuntu-volumes - .:/vt:delegated - - ${FULL_CACHE_PATH}ubuntu-cpp:/build:delegated + - ${build_root}ubuntu-cpp:/build:delegated command: &vt-cpp-command > /bin/bash -c " /vt/ci/build_cpp.sh /vt /build && @@ -376,7 +376,7 @@ services: <<: [*ccache, *vtopts] volumes: &alpine-volumes - .:/vt:delegated - - ${FULL_CACHE_PATH}alpine-cpp:/build:delegated + - ${build_root}alpine-cpp:/build:delegated command: *vt-cpp-command ############################################################################## diff --git a/scripts/workflows-azure.ini b/scripts/workflows-azure.ini index bcf8ef2586..24f534e708 100644 --- a/scripts/workflows-azure.ini +++ b/scripts/workflows-azure.ini @@ -33,7 +33,7 @@ triggers = "trigger:\\n branches:\\n include:\\n - develop\\n - ma warning = "###############################################################################\\n############## Warning this is a generated file---do not modify ###############\\n###############################################################################" job_name = build workflow_runs_on = "vmImage: 'ubuntu-22.04'" -build_root = $(ARCH)-[% linux %]-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/ubuntu-cpp +build_root = $(ARCH)-[% linux %]-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache linux_env = " UBUNTU: [% distro %]" vt_diagnostics = 1 pr_pattern = "pr:\\n drafts: false\\n autoCancel: true\\n branches:\\n include:\\n - '*'\\n" @@ -147,7 +147,7 @@ is_ubuntu = 0 linux = alpine linux_env ="" output_name = ci/azure/azure-clang-alpine-mpich.yml -build_root = $(ARCH)-[% linux %]-$(HOST_COMPILER)-$(COMPILER)-cache/alpine-cpp +build_root = $(ARCH)-[% linux %]-$(HOST_COMPILER)-$(COMPILER)-cache vt_production_build = 1 [PR-tests-clang-9] From 08ceffcc7b2c25dd1e3abb9bb175d2dab3a4a1a9 Mon Sep 17 00:00:00 2001 From: Arkadiusz Szczepkowicz Date: Thu, 14 Dec 2023 20:52:46 +0100 Subject: [PATCH 11/12] #2121: Fix build_root path --- .env | 10 ++++------ ci/azure/azure-clang-10-ubuntu-mpich.yml | 16 ++++++++++------ ci/azure/azure-clang-11-ubuntu-mpich.yml | 16 ++++++++++------ ci/azure/azure-clang-12-ubuntu-mpich.yml | 16 ++++++++++------ ci/azure/azure-clang-13-ubuntu-mpich.yml | 16 ++++++++++------ ci/azure/azure-clang-14-ubuntu-mpich.yml | 16 ++++++++++------ ci/azure/azure-clang-9-ubuntu-mpich.yml | 16 ++++++++++------ ci/azure/azure-clang-alpine-mpich.yml | 16 ++++++++++------ ci/azure/azure-gcc-10-ubuntu-openmpi.yml | 16 ++++++++++------ ci/azure/azure-gcc-11-ubuntu-mpich.yml | 16 ++++++++++------ ci/azure/azure-gcc-12-ubuntu-mpich.yml | 16 ++++++++++------ ci/azure/azure-gcc-8-ubuntu-mpich.yml | 16 ++++++++++------ ci/azure/azure-gcc-9-ubuntu-mpich.yml | 16 ++++++++++------ .../azure-intel-oneapi-icpc-ubuntu-mpich.yml | 16 ++++++++++------ .../azure-intel-oneapi-icpx-ubuntu-mpich.yml | 16 ++++++++++------ ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml | 16 ++++++++++------ ci/azure/azure-nvidia-12-ubuntu-mpich.yml | 16 ++++++++++------ docker-compose.yml | 4 ++-- scripts/workflow-azure-template.yml | 14 +++++++++----- scripts/workflows-azure.ini | 6 ++++-- 20 files changed, 179 insertions(+), 111 deletions(-) diff --git a/.env b/.env index 1127732530..ec1601a184 100644 --- a/.env +++ b/.env @@ -7,10 +7,8 @@ HOST_COMPILER=gcc-12 COMPILER_TYPE=gnu PROXY= TOKEN= -# Change this path to save the volume content on disk. -#CACHE= -build_root= +DISTINCT_DIR="${ARCH}-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-cache" -#VOLUME="${ARCH}-ubuntu-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-cache" -#TMP="${CACHE}${VOLUME}/" -#FULL_CACHE_PATH="${CACHE+${TMP}}" +# Change this path to save the volume content on disk. +# Example: /your/path/${DISTINCT_DIR}/ +BUILD_ROOT= diff --git a/ci/azure/azure-clang-10-ubuntu-mpich.yml b/ci/azure/azure-clang-10-ubuntu-mpich.yml index 5e8fa16539..2370e18eef 100644 --- a/ci/azure/azure-clang-10-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-10-ubuntu-mpich.yml @@ -58,7 +58,8 @@ variables: TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-clang-10-cache - build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache" + volume_name: ubuntu-cpp + build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/" TS: 0 TS_YEAR: 0 TS_MONTH: 0 @@ -114,7 +115,7 @@ stages: inputs: securityNamespace: cache key: $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) | $(TS_DAY) | $(TS) - path: '$(build_root)/ccache' + path: '$(build_root)$(volume_name)/ccache' restoreKeys: | $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) | $(TS_DAY) $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) @@ -152,8 +153,8 @@ stages: targetType: 'inline' script: | ./scripts/report_logs_in_comment.sh \ - "$(build_root)/vt/compilation_errors_warnings.out" \ - "$(build_root)/vt/cmake-output.log" \ + "$(build_root)$(volume_name)/vt/compilation_errors_warnings.out" \ + "$(build_root)$(volume_name)/vt/cmake-output.log" \ "$(Build.BuildNumber)" \ "$(System.PullRequest.PullRequestNumber)" \ "$(Build.Repository.Name)" \ @@ -180,8 +181,11 @@ stages: inputs: targetType: 'inline' script: | - zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)/vt/Testing/Temporary/LastTest.log - zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)/vt/cmake-output.log + ls -la $(build_root)$(volume_name) + docker volume ls + docker compose config + zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)$(volume_name)/vt/Testing/Temporary/LastTest.log + zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)$(volume_name)/vt/cmake-output.log - task: PublishPipelineArtifact@1 displayName: Upload CMake test output artifact continueOnError: true diff --git a/ci/azure/azure-clang-11-ubuntu-mpich.yml b/ci/azure/azure-clang-11-ubuntu-mpich.yml index 61d31dca49..426289a4ef 100644 --- a/ci/azure/azure-clang-11-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-11-ubuntu-mpich.yml @@ -58,7 +58,8 @@ variables: TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-clang-11-cache - build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache" + volume_name: ubuntu-cpp + build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/" TS: 0 TS_YEAR: 0 TS_MONTH: 0 @@ -114,7 +115,7 @@ stages: inputs: securityNamespace: cache key: $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) | $(TS_DAY) | $(TS) - path: '$(build_root)/ccache' + path: '$(build_root)$(volume_name)/ccache' restoreKeys: | $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) | $(TS_DAY) $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) @@ -152,8 +153,8 @@ stages: targetType: 'inline' script: | ./scripts/report_logs_in_comment.sh \ - "$(build_root)/vt/compilation_errors_warnings.out" \ - "$(build_root)/vt/cmake-output.log" \ + "$(build_root)$(volume_name)/vt/compilation_errors_warnings.out" \ + "$(build_root)$(volume_name)/vt/cmake-output.log" \ "$(Build.BuildNumber)" \ "$(System.PullRequest.PullRequestNumber)" \ "$(Build.Repository.Name)" \ @@ -180,8 +181,11 @@ stages: inputs: targetType: 'inline' script: | - zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)/vt/Testing/Temporary/LastTest.log - zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)/vt/cmake-output.log + ls -la $(build_root)$(volume_name) + docker volume ls + docker compose config + zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)$(volume_name)/vt/Testing/Temporary/LastTest.log + zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)$(volume_name)/vt/cmake-output.log - task: PublishPipelineArtifact@1 displayName: Upload CMake test output artifact continueOnError: true diff --git a/ci/azure/azure-clang-12-ubuntu-mpich.yml b/ci/azure/azure-clang-12-ubuntu-mpich.yml index 66a866a2cf..f89e09d603 100644 --- a/ci/azure/azure-clang-12-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-12-ubuntu-mpich.yml @@ -58,7 +58,8 @@ variables: TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-clang-12-cache - build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache" + volume_name: ubuntu-cpp + build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/" TS: 0 TS_YEAR: 0 TS_MONTH: 0 @@ -114,7 +115,7 @@ stages: inputs: securityNamespace: cache key: $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) | $(TS_DAY) | $(TS) - path: '$(build_root)/ccache' + path: '$(build_root)$(volume_name)/ccache' restoreKeys: | $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) | $(TS_DAY) $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) @@ -152,8 +153,8 @@ stages: targetType: 'inline' script: | ./scripts/report_logs_in_comment.sh \ - "$(build_root)/vt/compilation_errors_warnings.out" \ - "$(build_root)/vt/cmake-output.log" \ + "$(build_root)$(volume_name)/vt/compilation_errors_warnings.out" \ + "$(build_root)$(volume_name)/vt/cmake-output.log" \ "$(Build.BuildNumber)" \ "$(System.PullRequest.PullRequestNumber)" \ "$(Build.Repository.Name)" \ @@ -180,8 +181,11 @@ stages: inputs: targetType: 'inline' script: | - zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)/vt/Testing/Temporary/LastTest.log - zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)/vt/cmake-output.log + ls -la $(build_root)$(volume_name) + docker volume ls + docker compose config + zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)$(volume_name)/vt/Testing/Temporary/LastTest.log + zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)$(volume_name)/vt/cmake-output.log - task: PublishPipelineArtifact@1 displayName: Upload CMake test output artifact continueOnError: true diff --git a/ci/azure/azure-clang-13-ubuntu-mpich.yml b/ci/azure/azure-clang-13-ubuntu-mpich.yml index 4effcd3e10..91157438ee 100644 --- a/ci/azure/azure-clang-13-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-13-ubuntu-mpich.yml @@ -58,7 +58,8 @@ variables: TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-clang-13-cache - build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache" + volume_name: ubuntu-cpp + build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/" TS: 0 TS_YEAR: 0 TS_MONTH: 0 @@ -114,7 +115,7 @@ stages: inputs: securityNamespace: cache key: $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) | $(TS_DAY) | $(TS) - path: '$(build_root)/ccache' + path: '$(build_root)$(volume_name)/ccache' restoreKeys: | $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) | $(TS_DAY) $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) @@ -152,8 +153,8 @@ stages: targetType: 'inline' script: | ./scripts/report_logs_in_comment.sh \ - "$(build_root)/vt/compilation_errors_warnings.out" \ - "$(build_root)/vt/cmake-output.log" \ + "$(build_root)$(volume_name)/vt/compilation_errors_warnings.out" \ + "$(build_root)$(volume_name)/vt/cmake-output.log" \ "$(Build.BuildNumber)" \ "$(System.PullRequest.PullRequestNumber)" \ "$(Build.Repository.Name)" \ @@ -180,8 +181,11 @@ stages: inputs: targetType: 'inline' script: | - zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)/vt/Testing/Temporary/LastTest.log - zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)/vt/cmake-output.log + ls -la $(build_root)$(volume_name) + docker volume ls + docker compose config + zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)$(volume_name)/vt/Testing/Temporary/LastTest.log + zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)$(volume_name)/vt/cmake-output.log - task: PublishPipelineArtifact@1 displayName: Upload CMake test output artifact continueOnError: true diff --git a/ci/azure/azure-clang-14-ubuntu-mpich.yml b/ci/azure/azure-clang-14-ubuntu-mpich.yml index b4deec1c82..0e9331b9e1 100644 --- a/ci/azure/azure-clang-14-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-14-ubuntu-mpich.yml @@ -58,7 +58,8 @@ variables: TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-clang-14-cache - build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache" + volume_name: ubuntu-cpp + build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/" TS: 0 TS_YEAR: 0 TS_MONTH: 0 @@ -114,7 +115,7 @@ stages: inputs: securityNamespace: cache key: $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) | $(TS_DAY) | $(TS) - path: '$(build_root)/ccache' + path: '$(build_root)$(volume_name)/ccache' restoreKeys: | $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) | $(TS_DAY) $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) @@ -152,8 +153,8 @@ stages: targetType: 'inline' script: | ./scripts/report_logs_in_comment.sh \ - "$(build_root)/vt/compilation_errors_warnings.out" \ - "$(build_root)/vt/cmake-output.log" \ + "$(build_root)$(volume_name)/vt/compilation_errors_warnings.out" \ + "$(build_root)$(volume_name)/vt/cmake-output.log" \ "$(Build.BuildNumber)" \ "$(System.PullRequest.PullRequestNumber)" \ "$(Build.Repository.Name)" \ @@ -180,8 +181,11 @@ stages: inputs: targetType: 'inline' script: | - zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)/vt/Testing/Temporary/LastTest.log - zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)/vt/cmake-output.log + ls -la $(build_root)$(volume_name) + docker volume ls + docker compose config + zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)$(volume_name)/vt/Testing/Temporary/LastTest.log + zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)$(volume_name)/vt/cmake-output.log - task: PublishPipelineArtifact@1 displayName: Upload CMake test output artifact continueOnError: true diff --git a/ci/azure/azure-clang-9-ubuntu-mpich.yml b/ci/azure/azure-clang-9-ubuntu-mpich.yml index 1fb620cf0e..8347060666 100644 --- a/ci/azure/azure-clang-9-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-9-ubuntu-mpich.yml @@ -58,7 +58,8 @@ variables: TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-clang-9-cache - build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache" + volume_name: ubuntu-cpp + build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/" TS: 0 TS_YEAR: 0 TS_MONTH: 0 @@ -114,7 +115,7 @@ stages: inputs: securityNamespace: cache key: $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) | $(TS_DAY) | $(TS) - path: '$(build_root)/ccache' + path: '$(build_root)$(volume_name)/ccache' restoreKeys: | $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) | $(TS_DAY) $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) @@ -152,8 +153,8 @@ stages: targetType: 'inline' script: | ./scripts/report_logs_in_comment.sh \ - "$(build_root)/vt/compilation_errors_warnings.out" \ - "$(build_root)/vt/cmake-output.log" \ + "$(build_root)$(volume_name)/vt/compilation_errors_warnings.out" \ + "$(build_root)$(volume_name)/vt/cmake-output.log" \ "$(Build.BuildNumber)" \ "$(System.PullRequest.PullRequestNumber)" \ "$(Build.Repository.Name)" \ @@ -180,8 +181,11 @@ stages: inputs: targetType: 'inline' script: | - zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)/vt/Testing/Temporary/LastTest.log - zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)/vt/cmake-output.log + ls -la $(build_root)$(volume_name) + docker volume ls + docker compose config + zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)$(volume_name)/vt/Testing/Temporary/LastTest.log + zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)$(volume_name)/vt/cmake-output.log - task: PublishPipelineArtifact@1 displayName: Upload CMake test output artifact continueOnError: true diff --git a/ci/azure/azure-clang-alpine-mpich.yml b/ci/azure/azure-clang-alpine-mpich.yml index b244571880..d9d586e712 100644 --- a/ci/azure/azure-clang-alpine-mpich.yml +++ b/ci/azure/azure-clang-alpine-mpich.yml @@ -58,7 +58,8 @@ variables: TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: alpine-clang-13-cache - build_root: "$(CACHE)$(ARCH)-alpine-$(HOST_COMPILER)-$(COMPILER)-cache" + volume_name: alpine-cpp + build_root: "$(CACHE)$(ARCH)-alpine-$(HOST_COMPILER)-$(COMPILER)-cache/" TS: 0 TS_YEAR: 0 TS_MONTH: 0 @@ -114,7 +115,7 @@ stages: inputs: securityNamespace: cache key: $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) | $(TS_DAY) | $(TS) - path: '$(build_root)/ccache' + path: '$(build_root)$(volume_name)/ccache' restoreKeys: | $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) | $(TS_DAY) $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) @@ -152,8 +153,8 @@ stages: targetType: 'inline' script: | ./scripts/report_logs_in_comment.sh \ - "$(build_root)/vt/compilation_errors_warnings.out" \ - "$(build_root)/vt/cmake-output.log" \ + "$(build_root)$(volume_name)/vt/compilation_errors_warnings.out" \ + "$(build_root)$(volume_name)/vt/cmake-output.log" \ "$(Build.BuildNumber)" \ "$(System.PullRequest.PullRequestNumber)" \ "$(Build.Repository.Name)" \ @@ -180,8 +181,11 @@ stages: inputs: targetType: 'inline' script: | - zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)/vt/Testing/Temporary/LastTest.log - zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)/vt/cmake-output.log + ls -la $(build_root)$(volume_name) + docker volume ls + docker compose config + zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)$(volume_name)/vt/Testing/Temporary/LastTest.log + zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)$(volume_name)/vt/cmake-output.log - task: PublishPipelineArtifact@1 displayName: Upload CMake test output artifact continueOnError: true diff --git a/ci/azure/azure-gcc-10-ubuntu-openmpi.yml b/ci/azure/azure-gcc-10-ubuntu-openmpi.yml index c76e389bc5..d701c49ad5 100644 --- a/ci/azure/azure-gcc-10-ubuntu-openmpi.yml +++ b/ci/azure/azure-gcc-10-ubuntu-openmpi.yml @@ -58,7 +58,8 @@ variables: TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-gcc-10-cache - build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache" + volume_name: ubuntu-cpp + build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/" TS: 0 TS_YEAR: 0 TS_MONTH: 0 @@ -114,7 +115,7 @@ stages: inputs: securityNamespace: cache key: $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) | $(TS_DAY) | $(TS) - path: '$(build_root)/ccache' + path: '$(build_root)$(volume_name)/ccache' restoreKeys: | $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) | $(TS_DAY) $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) @@ -152,8 +153,8 @@ stages: targetType: 'inline' script: | ./scripts/report_logs_in_comment.sh \ - "$(build_root)/vt/compilation_errors_warnings.out" \ - "$(build_root)/vt/cmake-output.log" \ + "$(build_root)$(volume_name)/vt/compilation_errors_warnings.out" \ + "$(build_root)$(volume_name)/vt/cmake-output.log" \ "$(Build.BuildNumber)" \ "$(System.PullRequest.PullRequestNumber)" \ "$(Build.Repository.Name)" \ @@ -180,8 +181,11 @@ stages: inputs: targetType: 'inline' script: | - zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)/vt/Testing/Temporary/LastTest.log - zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)/vt/cmake-output.log + ls -la $(build_root)$(volume_name) + docker volume ls + docker compose config + zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)$(volume_name)/vt/Testing/Temporary/LastTest.log + zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)$(volume_name)/vt/cmake-output.log - task: PublishPipelineArtifact@1 displayName: Upload CMake test output artifact continueOnError: true diff --git a/ci/azure/azure-gcc-11-ubuntu-mpich.yml b/ci/azure/azure-gcc-11-ubuntu-mpich.yml index ee53374736..05b224ddcc 100644 --- a/ci/azure/azure-gcc-11-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-11-ubuntu-mpich.yml @@ -58,7 +58,8 @@ variables: TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-gcc-11-cache - build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache" + volume_name: ubuntu-cpp + build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/" TS: 0 TS_YEAR: 0 TS_MONTH: 0 @@ -114,7 +115,7 @@ stages: inputs: securityNamespace: cache key: $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) | $(TS_DAY) | $(TS) - path: '$(build_root)/ccache' + path: '$(build_root)$(volume_name)/ccache' restoreKeys: | $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) | $(TS_DAY) $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) @@ -152,8 +153,8 @@ stages: targetType: 'inline' script: | ./scripts/report_logs_in_comment.sh \ - "$(build_root)/vt/compilation_errors_warnings.out" \ - "$(build_root)/vt/cmake-output.log" \ + "$(build_root)$(volume_name)/vt/compilation_errors_warnings.out" \ + "$(build_root)$(volume_name)/vt/cmake-output.log" \ "$(Build.BuildNumber)" \ "$(System.PullRequest.PullRequestNumber)" \ "$(Build.Repository.Name)" \ @@ -180,8 +181,11 @@ stages: inputs: targetType: 'inline' script: | - zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)/vt/Testing/Temporary/LastTest.log - zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)/vt/cmake-output.log + ls -la $(build_root)$(volume_name) + docker volume ls + docker compose config + zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)$(volume_name)/vt/Testing/Temporary/LastTest.log + zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)$(volume_name)/vt/cmake-output.log - task: PublishPipelineArtifact@1 displayName: Upload CMake test output artifact continueOnError: true diff --git a/ci/azure/azure-gcc-12-ubuntu-mpich.yml b/ci/azure/azure-gcc-12-ubuntu-mpich.yml index 3c3b2023ad..6367af5153 100644 --- a/ci/azure/azure-gcc-12-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-12-ubuntu-mpich.yml @@ -58,7 +58,8 @@ variables: TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-gcc-12-cache - build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache" + volume_name: ubuntu-cpp + build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/" TS: 0 TS_YEAR: 0 TS_MONTH: 0 @@ -114,7 +115,7 @@ stages: inputs: securityNamespace: cache key: $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) | $(TS_DAY) | $(TS) - path: '$(build_root)/ccache' + path: '$(build_root)$(volume_name)/ccache' restoreKeys: | $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) | $(TS_DAY) $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) @@ -152,8 +153,8 @@ stages: targetType: 'inline' script: | ./scripts/report_logs_in_comment.sh \ - "$(build_root)/vt/compilation_errors_warnings.out" \ - "$(build_root)/vt/cmake-output.log" \ + "$(build_root)$(volume_name)/vt/compilation_errors_warnings.out" \ + "$(build_root)$(volume_name)/vt/cmake-output.log" \ "$(Build.BuildNumber)" \ "$(System.PullRequest.PullRequestNumber)" \ "$(Build.Repository.Name)" \ @@ -180,8 +181,11 @@ stages: inputs: targetType: 'inline' script: | - zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)/vt/Testing/Temporary/LastTest.log - zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)/vt/cmake-output.log + ls -la $(build_root)$(volume_name) + docker volume ls + docker compose config + zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)$(volume_name)/vt/Testing/Temporary/LastTest.log + zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)$(volume_name)/vt/cmake-output.log - task: PublishPipelineArtifact@1 displayName: Upload CMake test output artifact continueOnError: true diff --git a/ci/azure/azure-gcc-8-ubuntu-mpich.yml b/ci/azure/azure-gcc-8-ubuntu-mpich.yml index 92537a2548..c8c6f61711 100644 --- a/ci/azure/azure-gcc-8-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-8-ubuntu-mpich.yml @@ -58,7 +58,8 @@ variables: TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-gcc-8-cache - build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache" + volume_name: ubuntu-cpp + build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/" TS: 0 TS_YEAR: 0 TS_MONTH: 0 @@ -114,7 +115,7 @@ stages: inputs: securityNamespace: cache key: $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) | $(TS_DAY) | $(TS) - path: '$(build_root)/ccache' + path: '$(build_root)$(volume_name)/ccache' restoreKeys: | $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) | $(TS_DAY) $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) @@ -152,8 +153,8 @@ stages: targetType: 'inline' script: | ./scripts/report_logs_in_comment.sh \ - "$(build_root)/vt/compilation_errors_warnings.out" \ - "$(build_root)/vt/cmake-output.log" \ + "$(build_root)$(volume_name)/vt/compilation_errors_warnings.out" \ + "$(build_root)$(volume_name)/vt/cmake-output.log" \ "$(Build.BuildNumber)" \ "$(System.PullRequest.PullRequestNumber)" \ "$(Build.Repository.Name)" \ @@ -180,8 +181,11 @@ stages: inputs: targetType: 'inline' script: | - zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)/vt/Testing/Temporary/LastTest.log - zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)/vt/cmake-output.log + ls -la $(build_root)$(volume_name) + docker volume ls + docker compose config + zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)$(volume_name)/vt/Testing/Temporary/LastTest.log + zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)$(volume_name)/vt/cmake-output.log - task: PublishPipelineArtifact@1 displayName: Upload CMake test output artifact continueOnError: true diff --git a/ci/azure/azure-gcc-9-ubuntu-mpich.yml b/ci/azure/azure-gcc-9-ubuntu-mpich.yml index 07e9591fdf..164a712909 100644 --- a/ci/azure/azure-gcc-9-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-9-ubuntu-mpich.yml @@ -58,7 +58,8 @@ variables: TEST_LB_SCHEMA: 1 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-gcc-9-cache - build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache" + volume_name: ubuntu-cpp + build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/" TS: 0 TS_YEAR: 0 TS_MONTH: 0 @@ -114,7 +115,7 @@ stages: inputs: securityNamespace: cache key: $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) | $(TS_DAY) | $(TS) - path: '$(build_root)/ccache' + path: '$(build_root)$(volume_name)/ccache' restoreKeys: | $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) | $(TS_DAY) $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) @@ -152,8 +153,8 @@ stages: targetType: 'inline' script: | ./scripts/report_logs_in_comment.sh \ - "$(build_root)/vt/compilation_errors_warnings.out" \ - "$(build_root)/vt/cmake-output.log" \ + "$(build_root)$(volume_name)/vt/compilation_errors_warnings.out" \ + "$(build_root)$(volume_name)/vt/cmake-output.log" \ "$(Build.BuildNumber)" \ "$(System.PullRequest.PullRequestNumber)" \ "$(Build.Repository.Name)" \ @@ -180,8 +181,11 @@ stages: inputs: targetType: 'inline' script: | - zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)/vt/Testing/Temporary/LastTest.log - zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)/vt/cmake-output.log + ls -la $(build_root)$(volume_name) + docker volume ls + docker compose config + zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)$(volume_name)/vt/Testing/Temporary/LastTest.log + zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)$(volume_name)/vt/cmake-output.log - task: PublishPipelineArtifact@1 displayName: Upload CMake test output artifact 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 ef89e5fe6d..48b27dc455 100644 --- a/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml +++ b/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml @@ -58,7 +58,8 @@ variables: TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-intel-oneapi-icpc-cache - build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache" + volume_name: ubuntu-cpp + build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/" TS: 0 TS_YEAR: 0 TS_MONTH: 0 @@ -114,7 +115,7 @@ stages: inputs: securityNamespace: cache key: $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) | $(TS_DAY) | $(TS) - path: '$(build_root)/ccache' + path: '$(build_root)$(volume_name)/ccache' restoreKeys: | $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) | $(TS_DAY) $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) @@ -152,8 +153,8 @@ stages: targetType: 'inline' script: | ./scripts/report_logs_in_comment.sh \ - "$(build_root)/vt/compilation_errors_warnings.out" \ - "$(build_root)/vt/cmake-output.log" \ + "$(build_root)$(volume_name)/vt/compilation_errors_warnings.out" \ + "$(build_root)$(volume_name)/vt/cmake-output.log" \ "$(Build.BuildNumber)" \ "$(System.PullRequest.PullRequestNumber)" \ "$(Build.Repository.Name)" \ @@ -180,8 +181,11 @@ stages: inputs: targetType: 'inline' script: | - zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)/vt/Testing/Temporary/LastTest.log - zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)/vt/cmake-output.log + ls -la $(build_root)$(volume_name) + docker volume ls + docker compose config + zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)$(volume_name)/vt/Testing/Temporary/LastTest.log + zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)$(volume_name)/vt/cmake-output.log - task: PublishPipelineArtifact@1 displayName: Upload CMake test output artifact 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 1b3ba7e742..161ebd6090 100644 --- a/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml +++ b/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml @@ -58,7 +58,8 @@ variables: TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-intel-oneapi-icpx-cache - build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache" + volume_name: ubuntu-cpp + build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/" TS: 0 TS_YEAR: 0 TS_MONTH: 0 @@ -114,7 +115,7 @@ stages: inputs: securityNamespace: cache key: $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) | $(TS_DAY) | $(TS) - path: '$(build_root)/ccache' + path: '$(build_root)$(volume_name)/ccache' restoreKeys: | $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) | $(TS_DAY) $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) @@ -152,8 +153,8 @@ stages: targetType: 'inline' script: | ./scripts/report_logs_in_comment.sh \ - "$(build_root)/vt/compilation_errors_warnings.out" \ - "$(build_root)/vt/cmake-output.log" \ + "$(build_root)$(volume_name)/vt/compilation_errors_warnings.out" \ + "$(build_root)$(volume_name)/vt/cmake-output.log" \ "$(Build.BuildNumber)" \ "$(System.PullRequest.PullRequestNumber)" \ "$(Build.Repository.Name)" \ @@ -180,8 +181,11 @@ stages: inputs: targetType: 'inline' script: | - zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)/vt/Testing/Temporary/LastTest.log - zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)/vt/cmake-output.log + ls -la $(build_root)$(volume_name) + docker volume ls + docker compose config + zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)$(volume_name)/vt/Testing/Temporary/LastTest.log + zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)$(volume_name)/vt/cmake-output.log - task: PublishPipelineArtifact@1 displayName: Upload CMake test output artifact 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 5672c249c5..9700b5820f 100644 --- a/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml +++ b/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml @@ -58,7 +58,8 @@ variables: TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-nvidia-11.2-cache - build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache" + volume_name: ubuntu-cpp + build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/" TS: 0 TS_YEAR: 0 TS_MONTH: 0 @@ -114,7 +115,7 @@ stages: inputs: securityNamespace: cache key: $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) | $(TS_DAY) | $(TS) - path: '$(build_root)/ccache' + path: '$(build_root)$(volume_name)/ccache' restoreKeys: | $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) | $(TS_DAY) $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) @@ -152,8 +153,8 @@ stages: targetType: 'inline' script: | ./scripts/report_logs_in_comment.sh \ - "$(build_root)/vt/compilation_errors_warnings.out" \ - "$(build_root)/vt/cmake-output.log" \ + "$(build_root)$(volume_name)/vt/compilation_errors_warnings.out" \ + "$(build_root)$(volume_name)/vt/cmake-output.log" \ "$(Build.BuildNumber)" \ "$(System.PullRequest.PullRequestNumber)" \ "$(Build.Repository.Name)" \ @@ -180,8 +181,11 @@ stages: inputs: targetType: 'inline' script: | - zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)/vt/Testing/Temporary/LastTest.log - zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)/vt/cmake-output.log + ls -la $(build_root)$(volume_name) + docker volume ls + docker compose config + zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)$(volume_name)/vt/Testing/Temporary/LastTest.log + zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)$(volume_name)/vt/cmake-output.log - task: PublishPipelineArtifact@1 displayName: Upload CMake test output artifact continueOnError: true diff --git a/ci/azure/azure-nvidia-12-ubuntu-mpich.yml b/ci/azure/azure-nvidia-12-ubuntu-mpich.yml index 41d99b3ae5..6072c785ce 100644 --- a/ci/azure/azure-nvidia-12-ubuntu-mpich.yml +++ b/ci/azure/azure-nvidia-12-ubuntu-mpich.yml @@ -58,7 +58,8 @@ variables: TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-nvidia-12-cache - build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache" + volume_name: ubuntu-cpp + build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/" TS: 0 TS_YEAR: 0 TS_MONTH: 0 @@ -114,7 +115,7 @@ stages: inputs: securityNamespace: cache key: $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) | $(TS_DAY) | $(TS) - path: '$(build_root)/ccache' + path: '$(build_root)$(volume_name)/ccache' restoreKeys: | $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) | $(TS_DAY) $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) @@ -152,8 +153,8 @@ stages: targetType: 'inline' script: | ./scripts/report_logs_in_comment.sh \ - "$(build_root)/vt/compilation_errors_warnings.out" \ - "$(build_root)/vt/cmake-output.log" \ + "$(build_root)$(volume_name)/vt/compilation_errors_warnings.out" \ + "$(build_root)$(volume_name)/vt/cmake-output.log" \ "$(Build.BuildNumber)" \ "$(System.PullRequest.PullRequestNumber)" \ "$(Build.Repository.Name)" \ @@ -180,8 +181,11 @@ stages: inputs: targetType: 'inline' script: | - zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)/vt/Testing/Temporary/LastTest.log - zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)/vt/cmake-output.log + ls -la $(build_root)$(volume_name) + docker volume ls + docker compose config + zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)$(volume_name)/vt/Testing/Temporary/LastTest.log + zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)$(volume_name)/vt/cmake-output.log - task: PublishPipelineArtifact@1 displayName: Upload CMake test output artifact continueOnError: true diff --git a/docker-compose.yml b/docker-compose.yml index c88485c28f..3c65322bec 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -146,7 +146,7 @@ services: <<: [*ccache, *vtopts] volumes: &ubuntu-volumes - .:/vt:delegated - - ${build_root}ubuntu-cpp:/build:delegated + - ${BUILD_ROOT}ubuntu-cpp:/build:delegated command: &vt-cpp-command > /bin/bash -c " /vt/ci/build_cpp.sh /vt /build && @@ -376,7 +376,7 @@ services: <<: [*ccache, *vtopts] volumes: &alpine-volumes - .:/vt:delegated - - ${build_root}alpine-cpp:/build:delegated + - ${BUILD_ROOT}alpine-cpp:/build:delegated command: *vt-cpp-command ############################################################################## diff --git a/scripts/workflow-azure-template.yml b/scripts/workflow-azure-template.yml index aa4a566cb2..56bd30dfd6 100644 --- a/scripts/workflow-azure-template.yml +++ b/scripts/workflow-azure-template.yml @@ -45,6 +45,7 @@ variables: TEST_LB_SCHEMA: [% test_lb_schema %] CACHE: "$(Agent.TempDirectory)/cache/" cache_name: [% cache_name %] + volume_name: [% volume_name %] build_root: "$(CACHE)[% build_root %]" TS: 0 TS_YEAR: 0 @@ -101,7 +102,7 @@ stages: inputs: securityNamespace: cache key: $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) | $(TS_DAY) | $(TS) - path: '$(build_root)/ccache' + path: '$(build_root)$(volume_name)/ccache' restoreKeys: | $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) | $(TS_DAY) $(Agent.OS) | "$(cache_name)" | $(TS_YEAR) | $(TS_MONTH) @@ -139,8 +140,8 @@ stages: targetType: 'inline' script: | ./scripts/report_logs_in_comment.sh \ - "$(build_root)/vt/compilation_errors_warnings.out" \ - "$(build_root)/vt/cmake-output.log" \ + "$(build_root)$(volume_name)/vt/compilation_errors_warnings.out" \ + "$(build_root)$(volume_name)/vt/cmake-output.log" \ "$(Build.BuildNumber)" \ "$(System.PullRequest.PullRequestNumber)" \ "$(Build.Repository.Name)" \ @@ -167,8 +168,11 @@ stages: inputs: targetType: 'inline' script: | - zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)/vt/Testing/Temporary/LastTest.log - zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)/vt/cmake-output.log + ls -la $(build_root)$(volume_name) + docker volume ls + docker compose config + zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)$(volume_name)/vt/Testing/Temporary/LastTest.log + zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)$(volume_name)/vt/cmake-output.log - task: PublishPipelineArtifact@1 displayName: Upload CMake test output artifact continueOnError: true diff --git a/scripts/workflows-azure.ini b/scripts/workflows-azure.ini index 24f534e708..73e2c7d4b9 100644 --- a/scripts/workflows-azure.ini +++ b/scripts/workflows-azure.ini @@ -33,7 +33,8 @@ triggers = "trigger:\\n branches:\\n include:\\n - develop\\n - ma warning = "###############################################################################\\n############## Warning this is a generated file---do not modify ###############\\n###############################################################################" job_name = build workflow_runs_on = "vmImage: 'ubuntu-22.04'" -build_root = $(ARCH)-[% linux %]-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache +build_root = $(ARCH)-[% linux %]-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache/ +volume_name = "ubuntu-cpp" linux_env = " UBUNTU: [% distro %]" vt_diagnostics = 1 pr_pattern = "pr:\\n drafts: false\\n autoCancel: true\\n branches:\\n include:\\n - '*'\\n" @@ -147,7 +148,8 @@ is_ubuntu = 0 linux = alpine linux_env ="" output_name = ci/azure/azure-clang-alpine-mpich.yml -build_root = $(ARCH)-[% linux %]-$(HOST_COMPILER)-$(COMPILER)-cache +build_root = $(ARCH)-[% linux %]-$(HOST_COMPILER)-$(COMPILER)-cache/ +volume_name = "alpine-cpp" vt_production_build = 1 [PR-tests-clang-9] From d5f562c9d977b5a854bee7d0f03bebb5d49dae4a Mon Sep 17 00:00:00 2001 From: Arkadiusz Szczepkowicz Date: Tue, 19 Dec 2023 17:25:14 +0100 Subject: [PATCH 12/12] #2121: Remove temporary changes to enable CI on feature branch --- ci/azure/azure-clang-10-ubuntu-mpich.yml | 4 ---- ci/azure/azure-clang-11-ubuntu-mpich.yml | 4 ---- ci/azure/azure-clang-12-ubuntu-mpich.yml | 4 ---- ci/azure/azure-clang-13-ubuntu-mpich.yml | 4 ---- ci/azure/azure-clang-14-ubuntu-mpich.yml | 4 ---- ci/azure/azure-clang-9-ubuntu-mpich.yml | 4 ---- ci/azure/azure-clang-alpine-mpich.yml | 4 ---- ci/azure/azure-gcc-10-ubuntu-openmpi.yml | 4 ---- ci/azure/azure-gcc-11-ubuntu-mpich.yml | 4 ---- ci/azure/azure-gcc-12-ubuntu-mpich.yml | 4 ---- ci/azure/azure-gcc-8-ubuntu-mpich.yml | 4 ---- ci/azure/azure-gcc-9-ubuntu-mpich.yml | 4 ---- ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml | 4 ---- ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml | 4 ---- ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml | 4 ---- ci/azure/azure-nvidia-12-ubuntu-mpich.yml | 4 ---- scripts/workflow-azure-template.yml | 3 --- scripts/workflows-azure.ini | 2 +- 18 files changed, 1 insertion(+), 68 deletions(-) diff --git a/ci/azure/azure-clang-10-ubuntu-mpich.yml b/ci/azure/azure-clang-10-ubuntu-mpich.yml index 2370e18eef..6ae86de340 100644 --- a/ci/azure/azure-clang-10-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-10-ubuntu-mpich.yml @@ -9,7 +9,6 @@ trigger: include: - develop - main - - 2121-generalize-named-volumes pr: drafts: false @@ -181,9 +180,6 @@ stages: inputs: targetType: 'inline' script: | - ls -la $(build_root)$(volume_name) - docker volume ls - docker compose config zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)$(volume_name)/vt/Testing/Temporary/LastTest.log zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)$(volume_name)/vt/cmake-output.log - task: PublishPipelineArtifact@1 diff --git a/ci/azure/azure-clang-11-ubuntu-mpich.yml b/ci/azure/azure-clang-11-ubuntu-mpich.yml index 426289a4ef..3279ca6a19 100644 --- a/ci/azure/azure-clang-11-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-11-ubuntu-mpich.yml @@ -9,7 +9,6 @@ trigger: include: - develop - main - - 2121-generalize-named-volumes pr: drafts: false @@ -181,9 +180,6 @@ stages: inputs: targetType: 'inline' script: | - ls -la $(build_root)$(volume_name) - docker volume ls - docker compose config zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)$(volume_name)/vt/Testing/Temporary/LastTest.log zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)$(volume_name)/vt/cmake-output.log - task: PublishPipelineArtifact@1 diff --git a/ci/azure/azure-clang-12-ubuntu-mpich.yml b/ci/azure/azure-clang-12-ubuntu-mpich.yml index f89e09d603..7ae2127cac 100644 --- a/ci/azure/azure-clang-12-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-12-ubuntu-mpich.yml @@ -9,7 +9,6 @@ trigger: include: - develop - main - - 2121-generalize-named-volumes pr: drafts: false @@ -181,9 +180,6 @@ stages: inputs: targetType: 'inline' script: | - ls -la $(build_root)$(volume_name) - docker volume ls - docker compose config zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)$(volume_name)/vt/Testing/Temporary/LastTest.log zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)$(volume_name)/vt/cmake-output.log - task: PublishPipelineArtifact@1 diff --git a/ci/azure/azure-clang-13-ubuntu-mpich.yml b/ci/azure/azure-clang-13-ubuntu-mpich.yml index 91157438ee..a837a737f5 100644 --- a/ci/azure/azure-clang-13-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-13-ubuntu-mpich.yml @@ -9,7 +9,6 @@ trigger: include: - develop - main - - 2121-generalize-named-volumes pr: drafts: false @@ -181,9 +180,6 @@ stages: inputs: targetType: 'inline' script: | - ls -la $(build_root)$(volume_name) - docker volume ls - docker compose config zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)$(volume_name)/vt/Testing/Temporary/LastTest.log zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)$(volume_name)/vt/cmake-output.log - task: PublishPipelineArtifact@1 diff --git a/ci/azure/azure-clang-14-ubuntu-mpich.yml b/ci/azure/azure-clang-14-ubuntu-mpich.yml index 0e9331b9e1..07e5483fdd 100644 --- a/ci/azure/azure-clang-14-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-14-ubuntu-mpich.yml @@ -9,7 +9,6 @@ trigger: include: - develop - main - - 2121-generalize-named-volumes pr: drafts: false @@ -181,9 +180,6 @@ stages: inputs: targetType: 'inline' script: | - ls -la $(build_root)$(volume_name) - docker volume ls - docker compose config zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)$(volume_name)/vt/Testing/Temporary/LastTest.log zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)$(volume_name)/vt/cmake-output.log - task: PublishPipelineArtifact@1 diff --git a/ci/azure/azure-clang-9-ubuntu-mpich.yml b/ci/azure/azure-clang-9-ubuntu-mpich.yml index 8347060666..e51536e582 100644 --- a/ci/azure/azure-clang-9-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-9-ubuntu-mpich.yml @@ -9,7 +9,6 @@ trigger: include: - develop - main - - 2121-generalize-named-volumes pr: drafts: false @@ -181,9 +180,6 @@ stages: inputs: targetType: 'inline' script: | - ls -la $(build_root)$(volume_name) - docker volume ls - docker compose config zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)$(volume_name)/vt/Testing/Temporary/LastTest.log zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)$(volume_name)/vt/cmake-output.log - task: PublishPipelineArtifact@1 diff --git a/ci/azure/azure-clang-alpine-mpich.yml b/ci/azure/azure-clang-alpine-mpich.yml index d9d586e712..b6feb83488 100644 --- a/ci/azure/azure-clang-alpine-mpich.yml +++ b/ci/azure/azure-clang-alpine-mpich.yml @@ -9,7 +9,6 @@ trigger: include: - develop - main - - 2121-generalize-named-volumes pr: drafts: false @@ -181,9 +180,6 @@ stages: inputs: targetType: 'inline' script: | - ls -la $(build_root)$(volume_name) - docker volume ls - docker compose config zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)$(volume_name)/vt/Testing/Temporary/LastTest.log zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)$(volume_name)/vt/cmake-output.log - task: PublishPipelineArtifact@1 diff --git a/ci/azure/azure-gcc-10-ubuntu-openmpi.yml b/ci/azure/azure-gcc-10-ubuntu-openmpi.yml index d701c49ad5..ddd10dde62 100644 --- a/ci/azure/azure-gcc-10-ubuntu-openmpi.yml +++ b/ci/azure/azure-gcc-10-ubuntu-openmpi.yml @@ -9,7 +9,6 @@ trigger: include: - develop - main - - 2121-generalize-named-volumes pr: drafts: false @@ -181,9 +180,6 @@ stages: inputs: targetType: 'inline' script: | - ls -la $(build_root)$(volume_name) - docker volume ls - docker compose config zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)$(volume_name)/vt/Testing/Temporary/LastTest.log zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)$(volume_name)/vt/cmake-output.log - task: PublishPipelineArtifact@1 diff --git a/ci/azure/azure-gcc-11-ubuntu-mpich.yml b/ci/azure/azure-gcc-11-ubuntu-mpich.yml index 05b224ddcc..a814387d00 100644 --- a/ci/azure/azure-gcc-11-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-11-ubuntu-mpich.yml @@ -9,7 +9,6 @@ trigger: include: - develop - main - - 2121-generalize-named-volumes pr: drafts: false @@ -181,9 +180,6 @@ stages: inputs: targetType: 'inline' script: | - ls -la $(build_root)$(volume_name) - docker volume ls - docker compose config zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)$(volume_name)/vt/Testing/Temporary/LastTest.log zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)$(volume_name)/vt/cmake-output.log - task: PublishPipelineArtifact@1 diff --git a/ci/azure/azure-gcc-12-ubuntu-mpich.yml b/ci/azure/azure-gcc-12-ubuntu-mpich.yml index 6367af5153..3962de310e 100644 --- a/ci/azure/azure-gcc-12-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-12-ubuntu-mpich.yml @@ -9,7 +9,6 @@ trigger: include: - develop - main - - 2121-generalize-named-volumes pr: drafts: true @@ -181,9 +180,6 @@ stages: inputs: targetType: 'inline' script: | - ls -la $(build_root)$(volume_name) - docker volume ls - docker compose config zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)$(volume_name)/vt/Testing/Temporary/LastTest.log zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)$(volume_name)/vt/cmake-output.log - task: PublishPipelineArtifact@1 diff --git a/ci/azure/azure-gcc-8-ubuntu-mpich.yml b/ci/azure/azure-gcc-8-ubuntu-mpich.yml index c8c6f61711..f0bc5b2feb 100644 --- a/ci/azure/azure-gcc-8-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-8-ubuntu-mpich.yml @@ -9,7 +9,6 @@ trigger: include: - develop - main - - 2121-generalize-named-volumes pr: drafts: false @@ -181,9 +180,6 @@ stages: inputs: targetType: 'inline' script: | - ls -la $(build_root)$(volume_name) - docker volume ls - docker compose config zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)$(volume_name)/vt/Testing/Temporary/LastTest.log zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)$(volume_name)/vt/cmake-output.log - task: PublishPipelineArtifact@1 diff --git a/ci/azure/azure-gcc-9-ubuntu-mpich.yml b/ci/azure/azure-gcc-9-ubuntu-mpich.yml index 164a712909..c2b352056d 100644 --- a/ci/azure/azure-gcc-9-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-9-ubuntu-mpich.yml @@ -9,7 +9,6 @@ trigger: include: - develop - main - - 2121-generalize-named-volumes pr: drafts: false @@ -181,9 +180,6 @@ stages: inputs: targetType: 'inline' script: | - ls -la $(build_root)$(volume_name) - docker volume ls - docker compose config zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)$(volume_name)/vt/Testing/Temporary/LastTest.log zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)$(volume_name)/vt/cmake-output.log - task: PublishPipelineArtifact@1 diff --git a/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml b/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml index 48b27dc455..271c3d0922 100644 --- a/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml +++ b/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml @@ -9,7 +9,6 @@ trigger: include: - develop - main - - 2121-generalize-named-volumes pr: drafts: false @@ -181,9 +180,6 @@ stages: inputs: targetType: 'inline' script: | - ls -la $(build_root)$(volume_name) - docker volume ls - docker compose config zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)$(volume_name)/vt/Testing/Temporary/LastTest.log zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)$(volume_name)/vt/cmake-output.log - task: PublishPipelineArtifact@1 diff --git a/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml b/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml index 161ebd6090..5624f7e1e7 100644 --- a/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml +++ b/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml @@ -9,7 +9,6 @@ trigger: include: - develop - main - - 2121-generalize-named-volumes pr: drafts: false @@ -181,9 +180,6 @@ stages: inputs: targetType: 'inline' script: | - ls -la $(build_root)$(volume_name) - docker volume ls - docker compose config zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)$(volume_name)/vt/Testing/Temporary/LastTest.log zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)$(volume_name)/vt/cmake-output.log - task: PublishPipelineArtifact@1 diff --git a/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml b/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml index 9700b5820f..309f5fcd7e 100644 --- a/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml +++ b/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml @@ -9,7 +9,6 @@ trigger: include: - develop - main - - 2121-generalize-named-volumes pr: drafts: false @@ -181,9 +180,6 @@ stages: inputs: targetType: 'inline' script: | - ls -la $(build_root)$(volume_name) - docker volume ls - docker compose config zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)$(volume_name)/vt/Testing/Temporary/LastTest.log zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)$(volume_name)/vt/cmake-output.log - task: PublishPipelineArtifact@1 diff --git a/ci/azure/azure-nvidia-12-ubuntu-mpich.yml b/ci/azure/azure-nvidia-12-ubuntu-mpich.yml index 6072c785ce..b9ff75c33a 100644 --- a/ci/azure/azure-nvidia-12-ubuntu-mpich.yml +++ b/ci/azure/azure-nvidia-12-ubuntu-mpich.yml @@ -9,7 +9,6 @@ trigger: include: - develop - main - - 2121-generalize-named-volumes pr: drafts: false @@ -181,9 +180,6 @@ stages: inputs: targetType: 'inline' script: | - ls -la $(build_root)$(volume_name) - docker volume ls - docker compose config zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)$(volume_name)/vt/Testing/Temporary/LastTest.log zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)$(volume_name)/vt/cmake-output.log - task: PublishPipelineArtifact@1 diff --git a/scripts/workflow-azure-template.yml b/scripts/workflow-azure-template.yml index 56bd30dfd6..7ae91d3fd9 100644 --- a/scripts/workflow-azure-template.yml +++ b/scripts/workflow-azure-template.yml @@ -168,9 +168,6 @@ stages: inputs: targetType: 'inline' script: | - ls -la $(build_root)$(volume_name) - docker volume ls - docker compose config zip -j $(Agent.TempDirectory)/LastTest.log.gz $(build_root)$(volume_name)/vt/Testing/Temporary/LastTest.log zip -j $(Agent.TempDirectory)/cmake-output.log.gz $(build_root)$(volume_name)/vt/cmake-output.log - task: PublishPipelineArtifact@1 diff --git a/scripts/workflows-azure.ini b/scripts/workflows-azure.ini index 73e2c7d4b9..e5d45349af 100644 --- a/scripts/workflows-azure.ini +++ b/scripts/workflows-azure.ini @@ -29,7 +29,7 @@ linux = ubuntu cache_dir = "~/.local/cache/" cache_name = "[% linux %]-[% compiler %]-cache" docker_target = "[% linux %]-cpp-clean" -triggers = "trigger:\\n branches:\\n include:\\n - develop\\n - main\\n - 2121-generalize-named-volumes" +triggers = "trigger:\\n branches:\\n include:\\n - develop\\n - main" warning = "###############################################################################\\n############## Warning this is a generated file---do not modify ###############\\n###############################################################################" job_name = build workflow_runs_on = "vmImage: 'ubuntu-22.04'"