Skip to content

Commit 227dc91

Browse files
authored
azure-pipelines: specify pool.hostArchitecture correctly (#2323)
We need to specify 'arm64' for the hostArchitecture in 1ES pipeline templates so the correct tasks are installed/used on ARM machines. Defaults to 'amd64' (for x86-based hosts). This will avoid being spammed with warning messages from the non-blocking tasks that are trying to use the wrong binaries on ARM Linux builds.
2 parents f71874e + 9452c8a commit 227dc91

1 file changed

Lines changed: 7 additions & 0 deletions

File tree

.azure-pipelines/release.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,21 @@ parameters:
3535
jobName: 'Windows (x86)'
3636
runtime: win-x86
3737
pool: GitClientPME-1ESHostedPool-intel-pc
38+
poolArch: amd64
3839
image: win-x86_64-ado1es
3940
os: windows
4041
- id: windows_x64
4142
jobName: 'Windows (x64)'
4243
runtime: win-x64
4344
pool: GitClientPME-1ESHostedPool-intel-pc
45+
poolArch: amd64
4446
image: win-x86_64-ado1es
4547
os: windows
4648
- id: windows_arm64
4749
jobName: 'Windows (ARM64)'
4850
runtime: win-arm64
4951
pool: GitClientPME-1ESHostedPool-arm64-pc
52+
poolArch: arm64
5053
image: win-arm64-ado1es
5154
os: windows
5255

@@ -73,12 +76,14 @@ parameters:
7376
jobName: 'Linux (x64)'
7477
runtime: linux-x64
7578
pool: GitClientPME-1ESHostedPool-intel-pc
79+
poolArch: amd64
7680
image: ubuntu-x86_64-ado1es
7781
os: linux
7882
- id: linux_arm64
7983
jobName: 'Linux (ARM64)'
8084
runtime: linux-arm64
8185
pool: GitClientPME-1ESHostedPool-arm64-pc
86+
poolArch: arm64
8287
image: ubuntu-arm64-ado1es
8388
os: linux
8489

@@ -121,6 +126,7 @@ extends:
121126
name: ${{ dim.pool }}
122127
image: ${{ dim.image }}
123128
os: ${{ dim.os }}
129+
hostArchitecture: ${{ dim.poolArch }}
124130
templateContext:
125131
outputs:
126132
- output: pipelineArtifact
@@ -551,6 +557,7 @@ extends:
551557
name: ${{ dim.pool }}
552558
image: ${{ dim.image }}
553559
os: ${{ dim.os }}
560+
hostArchitecture: ${{ dim.poolArch }}
554561
templateContext:
555562
outputs:
556563
- output: pipelineArtifact

0 commit comments

Comments
 (0)