Skip to content

Commit

Permalink
Merge pull request #2207 from DARMA-tasking/2121-generalize-named-vol…
Browse files Browse the repository at this point in the history
…umes

#2121: Generalize names of named volumes
  • Loading branch information
lifflander authored Dec 20, 2023
2 parents 588a5c9 + d5f562c commit 13b1920
Show file tree
Hide file tree
Showing 20 changed files with 134 additions and 160 deletions.
6 changes: 5 additions & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,9 @@ COMPILER=gcc-12
HOST_COMPILER=gcc-12
COMPILER_TYPE=gnu
PROXY=
CACHE=
TOKEN=
DISTINCT_DIR="${ARCH}-${UBUNTU}-${HOST_COMPILER}-${COMPILER}-cache"

# Change this path to save the volume content on disk.
# Example: /your/path/${DISTINCT_DIR}/
BUILD_ROOT=
13 changes: 7 additions & 6 deletions ci/azure/azure-clang-10-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,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
Expand Down Expand Up @@ -113,7 +114,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)
Expand Down Expand Up @@ -151,8 +152,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)" \
Expand All @@ -179,8 +180,8 @@ 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
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
Expand Down
13 changes: 7 additions & 6 deletions ci/azure/azure-clang-11-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,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
Expand Down Expand Up @@ -113,7 +114,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)
Expand Down Expand Up @@ -151,8 +152,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)" \
Expand All @@ -179,8 +180,8 @@ 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
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
Expand Down
13 changes: 7 additions & 6 deletions ci/azure/azure-clang-12-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,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
Expand Down Expand Up @@ -113,7 +114,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)
Expand Down Expand Up @@ -151,8 +152,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)" \
Expand All @@ -179,8 +180,8 @@ 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
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
Expand Down
13 changes: 7 additions & 6 deletions ci/azure/azure-clang-13-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,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
Expand Down Expand Up @@ -113,7 +114,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)
Expand Down Expand Up @@ -151,8 +152,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)" \
Expand All @@ -179,8 +180,8 @@ 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
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
Expand Down
13 changes: 7 additions & 6 deletions ci/azure/azure-clang-14-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,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
Expand Down Expand Up @@ -113,7 +114,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)
Expand Down Expand Up @@ -151,8 +152,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)" \
Expand All @@ -179,8 +180,8 @@ 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
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
Expand Down
13 changes: 7 additions & 6 deletions ci/azure/azure-clang-9-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,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
Expand Down Expand Up @@ -113,7 +114,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)
Expand Down Expand Up @@ -151,8 +152,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)" \
Expand All @@ -179,8 +180,8 @@ 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
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
Expand Down
13 changes: 7 additions & 6 deletions ci/azure/azure-clang-alpine-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,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
Expand Down Expand Up @@ -113,7 +114,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)
Expand Down Expand Up @@ -151,8 +152,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)" \
Expand All @@ -179,8 +180,8 @@ 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
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
Expand Down
13 changes: 7 additions & 6 deletions ci/azure/azure-gcc-10-ubuntu-openmpi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,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
Expand Down Expand Up @@ -113,7 +114,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)
Expand Down Expand Up @@ -151,8 +152,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)" \
Expand All @@ -179,8 +180,8 @@ 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
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
Expand Down
13 changes: 7 additions & 6 deletions ci/azure/azure-gcc-11-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,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
Expand Down Expand Up @@ -113,7 +114,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)
Expand Down Expand Up @@ -151,8 +152,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)" \
Expand All @@ -179,8 +180,8 @@ 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
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
Expand Down
Loading

0 comments on commit 13b1920

Please sign in to comment.