Skip to content

Commit 088e213

Browse files
authored
build arm64 images on an arm64 pool (#1563)
build on arm64 pool Signed-off-by: Evan Baker <[email protected]> Signed-off-by: Evan Baker <[email protected]>
1 parent f50570e commit 088e213

File tree

2 files changed

+30
-22
lines changed

2 files changed

+30
-22
lines changed

.pipelines/containers/container-template.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,6 @@ steps:
1111
command: 'login'
1212
addPipelineData: false
1313

14-
- script: |
15-
set -e
16-
make qemu-user-static
17-
name: container_env
18-
displayName: Prepare Environment
19-
2014
- script: |
2115
set -e
2216
make ${{ parameters.name }}-image OS=${{ parameters.os }} ARCH=${{ parameters.arch }}

.pipelines/pipeline.yaml

Lines changed: 30 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -143,40 +143,54 @@ stages:
143143
- setup
144144
- test
145145
jobs:
146-
- job: containerize
146+
- job: containerize_linux_amd64
147147
displayName: Build Images
148148
pool:
149-
name: "$(BUILD_POOL_NAME_DEFAULT)"
149+
name: "$(BUILD_POOL_NAME_LINUX_AMD64)"
150150
strategy:
151151
matrix:
152152
acncli_linux_amd64:
153153
arch: amd64
154154
os: linux
155155
name: acncli
156-
acncli_linux_arm64:
157-
arch: arm64
158-
os: linux
159-
name: acncli
160156
cni_dropgz_linux_amd64:
161157
arch: amd64
162158
os: linux
163159
name: cni-dropgz
164-
cni_dropgz_linux_arm64:
165-
arch: arm64
166-
os: linux
167-
name: cni-dropgz
168160
cns_linux_amd64:
169161
arch: amd64
170162
os: linux
171163
name: cns
172-
cns_linux_arm64:
173-
arch: arm64
174-
os: linux
175-
name: cns
176164
npm_linux_amd64:
177165
arch: amd64
178166
os: linux
179167
name: npm
168+
steps:
169+
- template: containers/container-template.yaml
170+
parameters:
171+
name: $(name)
172+
os: $(os)
173+
arch: $(arch)
174+
- job: containerize_linux_arm64
175+
displayName: Build Images
176+
variables:
177+
TAG: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.Tag'] ]
178+
pool:
179+
name: "$(BUILD_POOL_NAME_LINUX_ARM64)"
180+
strategy:
181+
matrix:
182+
acncli_linux_arm64:
183+
arch: arm64
184+
os: linux
185+
name: acncli
186+
cni_dropgz_linux_arm64:
187+
arch: arm64
188+
os: linux
189+
name: cni-dropgz
190+
cns_linux_arm64:
191+
arch: arm64
192+
os: linux
193+
name: cns
180194
npm_linux_arm64:
181195
arch: arm64
182196
os: linux
@@ -187,12 +201,12 @@ stages:
187201
name: $(name)
188202
os: $(os)
189203
arch: $(arch)
190-
- job: containerize_windows
204+
- job: containerize_windows_amd64
191205
displayName: Build Images
192206
variables:
193207
TAG: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.Tag'] ]
194208
pool:
195-
name: "$(BUILD_POOL_NAME_DEFAULT_WINDOWS)"
209+
name: "$(BUILD_POOL_NAME_WINDOWS_AMD64)"
196210
strategy:
197211
matrix:
198212
cns_windows_amd64:

0 commit comments

Comments
 (0)