#2121: Add volume name to path on CI

DARMA-tasking · Dec 19, 2023 · 8b478b5 · 8b478b5
1 parent 6e2c798
commit 8b478b5
Show file tree

Hide file tree

Showing 18 changed files with 139 additions and 154 deletions.
diff --git 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,13 +181,11 @@ stages:
         inputs:
           targetType: 'inline'
           script: |
-            echo "build_root: ${build_root}"
-            echo "ls -la build_root"
-            ls -la $(build_root)
+            ls -la $(build_root)$(volume_name)
             docker volume ls
             docker compose config
-            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
+            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
@@ -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,13 +181,11 @@ stages:
         inputs:
           targetType: 'inline'
           script: |
-            echo "build_root: ${build_root}"
-            echo "ls -la build_root"
-            ls -la $(build_root)
+            ls -la $(build_root)$(volume_name)
             docker volume ls
             docker compose config
-            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
+            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
@@ -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,13 +181,11 @@ stages:
         inputs:
           targetType: 'inline'
           script: |
-            echo "build_root: ${build_root}"
-            echo "ls -la build_root"
-            ls -la $(build_root)
+            ls -la $(build_root)$(volume_name)
             docker volume ls
             docker compose config
-            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
+            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
@@ -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,13 +181,11 @@ stages:
         inputs:
           targetType: 'inline'
           script: |
-            echo "build_root: ${build_root}"
-            echo "ls -la build_root"
-            ls -la $(build_root)
+            ls -la $(build_root)$(volume_name)
             docker volume ls
             docker compose config
-            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
+            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
@@ -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,13 +181,11 @@ stages:
         inputs:
           targetType: 'inline'
           script: |
-            echo "build_root: ${build_root}"
-            echo "ls -la build_root"
-            ls -la $(build_root)
+            ls -la $(build_root)$(volume_name)
             docker volume ls
             docker compose config
-            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
+            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
@@ -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,13 +181,11 @@ stages:
         inputs:
           targetType: 'inline'
           script: |
-            echo "build_root: ${build_root}"
-            echo "ls -la build_root"
-            ls -la $(build_root)
+            ls -la $(build_root)$(volume_name)
             docker volume ls
             docker compose config
-            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
+            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
@@ -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,13 +181,11 @@ stages:
         inputs:
           targetType: 'inline'
           script: |
-            echo "build_root: ${build_root}"
-            echo "ls -la build_root"
-            ls -la $(build_root)
+            ls -la $(build_root)$(volume_name)
             docker volume ls
             docker compose config
-            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
+            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
@@ -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,13 +181,11 @@ stages:
         inputs:
           targetType: 'inline'
           script: |
-            echo "build_root: ${build_root}"
-            echo "ls -la build_root"
-            ls -la $(build_root)
+            ls -la $(build_root)$(volume_name)
             docker volume ls
             docker compose config
-            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
+            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