Skip to content

Commit f200f99

Browse files
authored
Support ARM-based Linux build agents (#564)
1 parent 267a557 commit f200f99

File tree

1 file changed

+20
-12
lines changed

1 file changed

+20
-12
lines changed

eng/common/templates/stages/build-test-publish-repo.yml

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,34 +45,42 @@ stages:
4545
pool: # linuxArm64v8Pool
4646
${{ if eq(variables['System.TeamProject'], 'public') }}:
4747
name: DotNetCore-Docker-Public
48+
demands:
49+
- Agent.OS -equals linux
50+
- Agent.OSArchitecture -equals ARM64
4851
${{ if eq(variables['System.TeamProject'], 'internal') }}:
4952
name: DotNetCore-Docker
50-
demands:
51-
- agent.os -equals linux
52-
- RemoteDockerServerOS -equals linux
53-
- RemoteDockerServerArch -equals aarch64
53+
demands:
54+
- Agent.OS -equals linux
55+
- RemoteDockerServerOS -equals linux
56+
- RemoteDockerServerArch -equals aarch64
5457
matrix: dependencies.GenerateBuildMatrix.outputs['matrix.LinuxArm64v8']
55-
useRemoteDockerServer: true
5658
dockerClientOS: linux
5759
buildJobTimeout: ${{ parameters.linuxArmBuildJobTimeout }}
5860
customInitSteps: ${{ parameters.customBuildInitSteps }}
61+
${{ if eq(variables['System.TeamProject'], 'internal') }}:
62+
useRemoteDockerServer: true
5963
- template: ../jobs/build-images.yml
6064
parameters:
6165
name: Linux_arm32v7
6266
pool: # linuxArm32v7Pool
6367
${{ if eq(variables['System.TeamProject'], 'public') }}:
6468
name: DotNetCore-Docker-Public
69+
demands:
70+
- Agent.OS -equals linux
71+
- Agent.OSArchitecture -equals ARM64
6572
${{ if eq(variables['System.TeamProject'], 'internal') }}:
6673
name: DotNetCore-Docker
67-
demands:
68-
- agent.os -equals linux
69-
- RemoteDockerServerOS -equals linux
70-
- RemoteDockerServerArch -equals aarch64
74+
demands:
75+
- Agent.OS -equals linux
76+
- RemoteDockerServerOS -equals linux
77+
- RemoteDockerServerArch -equals aarch64
7178
matrix: dependencies.GenerateBuildMatrix.outputs['matrix.LinuxArm32v7']
72-
useRemoteDockerServer: true
7379
dockerClientOS: linux
7480
buildJobTimeout: ${{ parameters.linuxArmBuildJobTimeout }}
7581
customInitSteps: ${{ parameters.customBuildInitSteps }}
82+
${{ if eq(variables['System.TeamProject'], 'internal') }}:
83+
useRemoteDockerServer: true
7684
- template: ../jobs/build-images.yml
7785
parameters:
7886
name: Windows1809_amd64
@@ -181,7 +189,7 @@ stages:
181189
pool: # linuxArm64v8Pool
182190
name: DotNetCore-Docker
183191
demands:
184-
- agent.os -equals linux
192+
- Agent.OS -equals linux
185193
- RemoteDockerServerOS -equals linux
186194
- RemoteDockerServerArch -equals aarch64
187195
matrix: dependencies.GenerateTestMatrix.outputs['matrix.LinuxArm64v8']
@@ -193,7 +201,7 @@ stages:
193201
pool: # linuxArm32v7Pool
194202
name: DotNetCore-Docker
195203
demands:
196-
- agent.os -equals linux
204+
- Agent.OS -equals linux
197205
- RemoteDockerServerOS -equals linux
198206
- RemoteDockerServerArch -equals aarch64
199207
matrix: dependencies.GenerateTestMatrix.outputs['matrix.LinuxArm32v7']

0 commit comments

Comments
 (0)