#2165: Add fix for Zip issue in azure CI

DARMA-tasking · Aug 3, 2023 · 9fba1ad · 9fba1ad
1 parent 23bb0a9
commit 9fba1ad
Show file tree

Hide file tree

Showing 18 changed files with 34 additions and 36 deletions.
diff --git a/ci/azure/azure-clang-10-ubuntu-mpich.yml b/ci/azure/azure-clang-10-ubuntu-mpich.yml
@@ -28,7 +28,7 @@ variables:
   UBUNTU: 20.04
   COMPILER_TYPE: clang
   COMPILER: clang-10
-
+  HOST_COMPILER: clang-10
   BUILD_TYPE: release
   ULIMIT_CORE: 0
   CODE_COVERAGE: 0
@@ -57,7 +57,7 @@ variables:
   TEST_LB_SCHEMA: 0
   CACHE: "$(Agent.TempDirectory)/cache/"
   cache_name: ubuntu-clang-10-cache
-  build_root: "$(CACHE)/$(ARCH)-ubuntu-$(UBUNTU)-$(COMPILER)-cache/"
+  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
@@ -28,7 +28,7 @@ variables:
   UBUNTU: 22.04
   COMPILER_TYPE: clang
   COMPILER: clang-11
-
+  HOST_COMPILER: clang-11
   BUILD_TYPE: release
   ULIMIT_CORE: 0
   CODE_COVERAGE: 0
@@ -57,7 +57,7 @@ variables:
   TEST_LB_SCHEMA: 0
   CACHE: "$(Agent.TempDirectory)/cache/"
   cache_name: ubuntu-clang-11-cache
-  build_root: "$(CACHE)/$(ARCH)-ubuntu-$(UBUNTU)-$(COMPILER)-cache/"
+  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
@@ -28,7 +28,7 @@ variables:
   UBUNTU: 22.04
   COMPILER_TYPE: clang
   COMPILER: clang-12
-
+  HOST_COMPILER: clang-12
   BUILD_TYPE: release
   ULIMIT_CORE: 0
   CODE_COVERAGE: 0
@@ -57,7 +57,7 @@ variables:
   TEST_LB_SCHEMA: 0
   CACHE: "$(Agent.TempDirectory)/cache/"
   cache_name: ubuntu-clang-12-cache
-  build_root: "$(CACHE)/$(ARCH)-ubuntu-$(UBUNTU)-$(COMPILER)-cache/"
+  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
@@ -28,7 +28,7 @@ variables:
   UBUNTU: 22.04
   COMPILER_TYPE: clang
   COMPILER: clang-13
-
+  HOST_COMPILER: clang-13
   BUILD_TYPE: release
   ULIMIT_CORE: 0
   CODE_COVERAGE: 0
@@ -57,7 +57,7 @@ variables:
   TEST_LB_SCHEMA: 0
   CACHE: "$(Agent.TempDirectory)/cache/"
   cache_name: ubuntu-clang-13-cache
-  build_root: "$(CACHE)/$(ARCH)-ubuntu-$(UBUNTU)-$(COMPILER)-cache/"
+  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
@@ -28,7 +28,7 @@ variables:
   UBUNTU: 22.04
   COMPILER_TYPE: clang
   COMPILER: clang-14
-
+  HOST_COMPILER: clang-14
   BUILD_TYPE: release
   ULIMIT_CORE: 0
   CODE_COVERAGE: 0
@@ -57,7 +57,7 @@ variables:
   TEST_LB_SCHEMA: 0
   CACHE: "$(Agent.TempDirectory)/cache/"
   cache_name: ubuntu-clang-14-cache
-  build_root: "$(CACHE)/$(ARCH)-ubuntu-$(UBUNTU)-$(COMPILER)-cache/"
+  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
@@ -28,7 +28,7 @@ variables:
   UBUNTU: 20.04
   COMPILER_TYPE: clang
   COMPILER: clang-9
-
+  HOST_COMPILER: clang-9
   BUILD_TYPE: release
   ULIMIT_CORE: 0
   CODE_COVERAGE: 0
@@ -57,7 +57,7 @@ variables:
   TEST_LB_SCHEMA: 0
   CACHE: "$(Agent.TempDirectory)/cache/"
   cache_name: ubuntu-clang-9-cache
-  build_root: "$(CACHE)/$(ARCH)-ubuntu-$(UBUNTU)-$(COMPILER)-cache/"
+  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
@@ -28,7 +28,7 @@ variables:
 
   COMPILER_TYPE: clang
   COMPILER: clang-13
-
+  HOST_COMPILER: clang-13
   BUILD_TYPE: release
   ULIMIT_CORE: 0
   CODE_COVERAGE: 0
@@ -57,7 +57,7 @@ variables:
   TEST_LB_SCHEMA: 0
   CACHE: "$(Agent.TempDirectory)/cache/"
   cache_name: alpine-clang-13-cache
-  build_root: "$(CACHE)/$(ARCH)-alpine-$(COMPILER)-cache/"
+  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
@@ -28,7 +28,7 @@ variables:
   UBUNTU: 20.04
   COMPILER_TYPE: gnu
   COMPILER: gcc-10
-
+  HOST_COMPILER: gcc-10
   BUILD_TYPE: release
   ULIMIT_CORE: 0
   CODE_COVERAGE: 0
@@ -57,7 +57,7 @@ variables:
   TEST_LB_SCHEMA: 0
   CACHE: "$(Agent.TempDirectory)/cache/"
   cache_name: ubuntu-gcc-10-cache
-  build_root: "$(CACHE)/$(ARCH)-ubuntu-$(UBUNTU)-$(COMPILER)-cache/"
+  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
@@ -28,7 +28,7 @@ variables:
   UBUNTU: 22.04
   COMPILER_TYPE: gnu
   COMPILER: gcc-11
-
+  HOST_COMPILER: gcc-11
   BUILD_TYPE: release
   ULIMIT_CORE: 0
   CODE_COVERAGE: 1
@@ -57,7 +57,7 @@ variables:
   TEST_LB_SCHEMA: 0
   CACHE: "$(Agent.TempDirectory)/cache/"
   cache_name: ubuntu-gcc-11-cache
-  build_root: "$(CACHE)/$(ARCH)-ubuntu-$(UBUNTU)-$(COMPILER)-cache/"
+  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
@@ -28,7 +28,7 @@ variables:
   UBUNTU: 22.04
   COMPILER_TYPE: gnu
   COMPILER: gcc-12
-
+  HOST_COMPILER: gcc-12
   BUILD_TYPE: release
   ULIMIT_CORE: 0
   CODE_COVERAGE: 0
@@ -57,7 +57,7 @@ variables:
   TEST_LB_SCHEMA: 0
   CACHE: "$(Agent.TempDirectory)/cache/"
   cache_name: ubuntu-gcc-12-cache
-  build_root: "$(CACHE)/$(ARCH)-ubuntu-$(UBUNTU)-$(COMPILER)-cache/"
+  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
@@ -28,7 +28,7 @@ variables:
   UBUNTU: 18.04
   COMPILER_TYPE: gnu
   COMPILER: gcc-8
-
+  HOST_COMPILER: gcc-8
   BUILD_TYPE: release
   ULIMIT_CORE: 0
   CODE_COVERAGE: 0
@@ -57,7 +57,7 @@ variables:
   TEST_LB_SCHEMA: 0
   CACHE: "$(Agent.TempDirectory)/cache/"
   cache_name: ubuntu-gcc-8-cache
-  build_root: "$(CACHE)/$(ARCH)-ubuntu-$(UBUNTU)-$(COMPILER)-cache/"
+  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
@@ -28,7 +28,7 @@ variables:
   UBUNTU: 20.04
   COMPILER_TYPE: gnu
   COMPILER: gcc-9
-
+  HOST_COMPILER: gcc-9
   BUILD_TYPE: release
   ULIMIT_CORE: 0
   CODE_COVERAGE: 0
@@ -57,7 +57,7 @@ variables:
   TEST_LB_SCHEMA: 1
   CACHE: "$(Agent.TempDirectory)/cache/"
   cache_name: ubuntu-gcc-9-cache
-  build_root: "$(CACHE)/$(ARCH)-ubuntu-$(UBUNTU)-$(COMPILER)-cache/"
+  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
@@ -28,7 +28,7 @@ variables:
   UBUNTU: 20.04
   COMPILER_TYPE: intel-oneapi
   COMPILER: icpc
-
+  HOST_COMPILER: icpc
   BUILD_TYPE: release
   ULIMIT_CORE: 0
   CODE_COVERAGE: 0
@@ -57,7 +57,7 @@ variables:
   TEST_LB_SCHEMA: 0
   CACHE: "$(Agent.TempDirectory)/cache/"
   cache_name: ubuntu-intel-oneapi-icpc-cache
-  build_root: "$(CACHE)/$(ARCH)-ubuntu-$(UBUNTU)-$(COMPILER)-cache/"
+  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
@@ -28,7 +28,7 @@ variables:
   UBUNTU: 20.04
   COMPILER_TYPE: intel-oneapi
   COMPILER: icpx
-
+  HOST_COMPILER: icpx
   BUILD_TYPE: release
   ULIMIT_CORE: 0
   CODE_COVERAGE: 0
@@ -57,7 +57,7 @@ variables:
   TEST_LB_SCHEMA: 0
   CACHE: "$(Agent.TempDirectory)/cache/"
   cache_name: ubuntu-intel-oneapi-icpx-cache
-  build_root: "$(CACHE)/$(ARCH)-ubuntu-$(UBUNTU)-$(COMPILER)-cache/"
+  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
@@ -57,7 +57,7 @@ variables:
   TEST_LB_SCHEMA: 0
   CACHE: "$(Agent.TempDirectory)/cache/"
   cache_name: ubuntu-nvidia-11.2-cache
-  build_root: "$(CACHE)/$(ARCH)-ubuntu-$(UBUNTU)-$(COMPILER)-cache/"
+  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
@@ -57,7 +57,7 @@ variables:
   TEST_LB_SCHEMA: 0
   CACHE: "$(Agent.TempDirectory)/cache/"
   cache_name: ubuntu-nvidia-12-cache
-  build_root: "$(CACHE)/$(ARCH)-ubuntu-$(UBUNTU)-$(COMPILER)-cache/"
+  build_root: "$(CACHE)$(ARCH)-ubuntu-$(UBUNTU)-$(HOST_COMPILER)-$(COMPILER)-cache"
   TS: 0
   TS_YEAR: 0
   TS_MONTH: 0

diff --git a/scripts/workflow-azure-template.yml b/scripts/workflow-azure-template.yml
@@ -16,7 +16,7 @@ variables:
 [% linux_env %]
   COMPILER_TYPE: [% compiler_type %]
   COMPILER: [% compiler %]
-[% host_compiler_line %]
+  HOST_COMPILER: [% IF host_compiler %][% host_compiler %][% ELSE %][% compiler %][% END %]
   BUILD_TYPE: [% build_type %]
   ULIMIT_CORE: [% ulimit_core %]
   CODE_COVERAGE: [% code_coverage %]
@@ -45,7 +45,7 @@ variables:
   TEST_LB_SCHEMA: [% test_lb_schema %]
   CACHE: "$(Agent.TempDirectory)/cache/"
   cache_name: [% cache_name %]
-  build_root: "$(CACHE)/[% build_root %]/"
+  build_root: "$(CACHE)[% build_root %]"
   TS: 0
   TS_YEAR: 0
   TS_MONTH: 0

diff --git 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)-$(COMPILER)-cache
+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"
@@ -65,7 +65,6 @@ test_configuration = "nvidia cuda 12.1.0, gcc-9, ubuntu, mpich"
 compiler_type = nvidia
 compiler = 12.1.0
 host_compiler = gcc-9
-host_compiler_line = "  HOST_COMPILER: [% host_compiler %]"
 distro = 20.04
 cache_name = ubuntu-nvidia-12-cache
 output_name = ci/azure/azure-nvidia-12-ubuntu-mpich.yml
@@ -81,7 +80,6 @@ test_configuration = "nvidia cuda 11.2, gcc-9, ubuntu, mpich"
 compiler_type = nvidia
 compiler = 11.2.0
 host_compiler = gcc-9
-host_compiler_line = "  HOST_COMPILER: [% host_compiler %]"
 distro = 20.04
 cache_name = ubuntu-nvidia-11.2-cache
 output_name = ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml
@@ -149,7 +147,7 @@ is_ubuntu = 0
 linux = alpine
 linux_env =""
 output_name = ci/azure/azure-clang-alpine-mpich.yml
-build_root = $(ARCH)-[% linux %]-$(COMPILER)-cache
+build_root = $(ARCH)-[% linux %]-$(HOST_COMPILER)-$(COMPILER)-cache
 vt_production_build = 1
 
 [PR-tests-clang-9]