Skip to content

Commit ecb6a4e

Browse files
rbtrrbtr
authored
feat: windows hpc base image
Signed-off-by: Evan Baker <[email protected]>
1 parent b5a7f14 commit ecb6a4e

File tree

11 files changed

+45
-168
lines changed

11 files changed

+45
-168
lines changed

‎.pipelines/containers/container-template.steps.yaml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ parameters:
22
arch: ""
33
name: ""
44
os: ""
5-
os_version: ""
65

76
steps:
87
- task: AzureCLI@2
@@ -17,7 +16,7 @@ steps:
1716
- script: |
1817
set -e
1918
if [ "$IN_OS" = 'windows' ]; then export BUILDX_ACTION='--push'; fi
20-
make "$IMGNAME" OS="$IN_OS" ARCH="$IN_ARCH" OS_VERSION="$IN_OS_VERSION"
19+
make "$IMGNAME" OS="$IN_OS" ARCH="$IN_ARCH"
2120
name: image_build
2221
displayName: Image Build
2322
workingDirectory: $(ACN_DIR)
@@ -26,7 +25,6 @@ steps:
2625
IMGNAME: '${{ parameters.name }}-image'
2726
IN_OS: '${{ parameters.os }}'
2827
IN_ARCH: '${{ parameters.arch }}'
29-
IN_OS_VERSION: '${{ parameters.os_version }}'
3028

3129
- task: AzureCLI@2
3230
displayName: "Logout"

‎.pipelines/containers/container-template.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ parameters:
22
arch: ""
33
name: ""
44
os: ""
5-
os_version: ""
65

76
steps:
87
- task: AzureCLI@2
@@ -17,7 +16,7 @@ steps:
1716
- script: |
1817
set -e
1918
if [ ${{ parameters.os }} = 'windows' ]; then export BUILDX_ACTION='--push'; fi
20-
make ${{ parameters.name }}-image OS=${{ parameters.os }} ARCH=${{ parameters.arch }} OS_VERSION=${{ parameters.os_version }}
19+
make ${{ parameters.name }}-image OS=${{ parameters.os }} ARCH=${{ parameters.arch }}
2120
name: image_build
2221
displayName: Image Build
2322
retryCountOnTaskFailure: 3

‎.pipelines/containers/manifest-template.steps.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
parameters:
22
name: ""
33
platforms: ""
4-
os_versions: ""
54

65
steps:
76

@@ -16,7 +15,7 @@ steps:
1615
1716
- script: |
1817
set -e
19-
make ${{ parameters.name }}-manifest-build PLATFORMS="${{ parameters.platforms }}" OS_VERSIONS="${{ parameters.os_versions }}"
18+
make ${{ parameters.name }}-manifest-build PLATFORMS="${{ parameters.platforms }}"
2019
workingDirectory: $(ACN_DIR)
2120
name: manifest_build
2221
displayName: Manifest Build

‎.pipelines/containers/manifest-template.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
parameters:
22
name: ""
33
platforms: ""
4-
os_versions: ""
54

65
steps:
76

@@ -16,7 +15,7 @@ steps:
1615
1716
- script: |
1817
set -e
19-
make ${{ parameters.name }}-manifest-build PLATFORMS="${{ parameters.platforms }}" OS_VERSIONS="${{ parameters.os_versions }}"
18+
make ${{ parameters.name }}-manifest-build PLATFORMS="${{ parameters.platforms }}"
2019
name: manifest_build
2120
displayName: Manifest Build
2221
retryCountOnTaskFailure: 3

‎.pipelines/pipeline.yaml‎

Lines changed: 4 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -110,54 +110,26 @@ stages:
110110
arch: amd64
111111
name: azure-ipam
112112
os: linux
113-
azure_ipam_windows2019_amd64:
113+
azure_ipam_windows:
114114
arch: amd64
115115
name: azure-ipam
116116
os: windows
117-
os_version: ltsc2019
118-
azure_ipam_windows2022_amd64:
119-
arch: amd64
120-
name: azure-ipam
121-
os: windows
122-
os_version: ltsc2022
123117
cni_linux_amd64:
124118
arch: amd64
125119
name: cni
126120
os: linux
127-
cni_windows2019_amd64:
128-
arch: amd64
129-
name: cni
130-
os: windows
131-
os_version: ltsc2019
132-
cni_windows2022_amd64:
121+
cni_windows_amd64:
133122
arch: amd64
134123
name: cni
135124
os: windows
136-
os_version: ltsc2022
137-
cni_windows2025_amd64:
138-
arch: amd64
139-
name: cni
140-
os: windows
141-
os_version: ltsc2025
142125
cns_linux_amd64:
143126
arch: amd64
144127
name: cns
145128
os: linux
146-
cns_windows2019_amd64:
147-
arch: amd64
148-
name: cns
149-
os: windows
150-
os_version: ltsc2019
151-
cns_windows2022_amd64:
152-
arch: amd64
153-
name: cns
154-
os: windows
155-
os_version: ltsc2022
156-
cns_windows2025_amd64:
129+
cns_windows_amd64:
157130
arch: amd64
158131
name: cns
159132
os: windows
160-
os_version: ltsc2025
161133
ipv6_hp_bpf_linux_amd64:
162134
arch: amd64
163135
name: ipv6-hp-bpf
@@ -166,11 +138,10 @@ stages:
166138
arch: amd64
167139
name: npm
168140
os: linux
169-
npm_windows2022_amd64:
141+
npm_windows_amd64:
170142
arch: amd64
171143
name: npm
172144
os: windows
173-
os_version: ltsc2022
174145
steps:
175146
- template: containers/container-template.yaml
176147
parameters:
@@ -226,28 +197,23 @@ stages:
226197
matrix:
227198
azure_ipam:
228199
name: azure-ipam
229-
os_versions: ltsc2019 ltsc2022
230200
platforms: linux/amd64 linux/arm64 windows/amd64
231201
cni:
232202
name: cni
233-
os_versions: ltsc2019 ltsc2022 ltsc2025
234203
platforms: linux/amd64 linux/arm64 windows/amd64
235204
cns:
236205
name: cns
237-
os_versions: ltsc2019 ltsc2022 ltsc2025
238206
platforms: linux/amd64 linux/arm64 windows/amd64
239207
ipv6_hp_bpf:
240208
name: ipv6-hp-bpf
241209
platforms: linux/amd64 linux/arm64
242210
npm:
243211
name: npm
244-
os_versions: ltsc2022
245212
platforms: linux/amd64 linux/arm64 windows/amd64
246213
steps:
247214
- template: containers/manifest-template.yaml
248215
parameters:
249216
name: $(name)
250-
os_versions: $(os_versions)
251217
platforms: $(platforms)
252218

253219
# Cilium Podsubnet E2E tests

‎.pipelines/run-pipeline.yaml‎

Lines changed: 8 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -122,64 +122,31 @@ stages:
122122
arch: amd64
123123
name: azure-ipam
124124
os: linux
125-
azure_ipam_windows2019_amd64:
126-
Suffix: azure_ipam_windows2019_amd64
125+
azure_ipam_windows_amd64:
126+
Suffix: azure_ipam_windows_amd64
127127
arch: amd64
128128
name: azure-ipam
129129
os: windows
130-
os_version: ltsc2019
131-
azure_ipam_windows2022_amd64:
132-
Suffix: azure_ipam_windows2022_amd64
133-
arch: amd64
134-
name: azure-ipam
135-
os: windows
136-
os_version: ltsc2022
137130
cni_linux_amd64:
138131
Suffix: cni_linux_amd64
139132
arch: amd64
140133
name: cni
141134
os: linux
142-
cni_windows2019_amd64:
143-
Suffix: cni_windows2019_amd64
144-
arch: amd64
145-
name: cni
146-
os: windows
147-
os_version: ltsc2019
148-
cni_windows2022_amd64:
149-
Suffix: cni_windows2022_amd64
135+
cni_windows_amd64:
136+
Suffix: cni_windows_amd64
150137
arch: amd64
151138
name: cni
152139
os: windows
153-
os_version: ltsc2022
154-
cni_windows2025_amd64:
155-
Suffix: cni_windows2025_amd64
156-
arch: amd64
157-
name: cni
158-
os: windows
159-
os_version: ltsc2025
160140
cns_linux_amd64:
161141
Suffix: cns_linux_amd64
162142
arch: amd64
163143
name: cns
164144
os: linux
165-
cns_windows2019_amd64:
166-
Suffix: cns_windows2019_amd64
167-
arch: amd64
168-
name: cns
169-
os: windows
170-
os_version: ltsc2019
171-
cns_windows2022_amd64:
172-
Suffix: cns_windows2022_amd64
173-
arch: amd64
174-
name: cns
175-
os: windows
176-
os_version: ltsc2022
177-
cns_windows2025_amd64:
178-
Suffix: cns_windows2025_amd64
145+
cns_windows_amd64:
146+
Suffix: cns_windows_amd64
179147
arch: amd64
180148
name: cns
181149
os: windows
182-
os_version: ltsc2025
183150
ipv6_hp_bpf_linux_amd64:
184151
Suffix: ipv6_hp_bpf_linux_amd64
185152
arch: amd64
@@ -190,12 +157,11 @@ stages:
190157
arch: amd64
191158
name: npm
192159
os: linux
193-
npm_windows2022_amd64:
194-
Suffix: npm_windows2022_amd64
160+
npm_windows_amd64:
161+
Suffix: npm_windows_amd64
195162
arch: amd64
196163
name: npm
197164
os: windows
198-
os_version: ltsc2022
199165
variables:
200166
ob_git_checkout: true
201167
ob_artifactSuffix: $(Suffix) # this is needed to not collide published artifact containers
@@ -209,7 +175,6 @@ stages:
209175
arch: $(arch)
210176
name: $(name)
211177
os: $(os)
212-
os_version: $(os_version)
213178

214179
- job: containerize_linux_arm64
215180
displayName: Build Images
@@ -280,17 +245,14 @@ stages:
280245
matrix:
281246
azure_ipam:
282247
name: azure-ipam
283-
os_versions: ltsc2019 ltsc2022
284248
platforms: linux/amd64 linux/arm64 windows/amd64
285249
Suffix: azure-ipam
286250
cni:
287251
name: cni
288-
os_versions: ltsc2019 ltsc2022 ltsc2025
289252
platforms: linux/amd64 linux/arm64 windows/amd64
290253
Suffix: cni
291254
cns:
292255
name: cns
293-
os_versions: ltsc2019 ltsc2022 ltsc2025
294256
platforms: linux/amd64 linux/arm64 windows/amd64
295257
Suffix: cns
296258
ipv6_hp_bpf:
@@ -299,7 +261,6 @@ stages:
299261
Suffix: ipv6-hp-bpf
300262
npm:
301263
name: npm
302-
os_versions: ltsc2022
303264
platforms: linux/amd64 linux/arm64 windows/amd64
304265
Suffix: npm
305266
variables:
@@ -317,7 +278,6 @@ stages:
317278
- template: containers/manifest-template.steps.yaml@ACNTools
318279
parameters:
319280
name: $(name)
320-
os_versions: $(os_versions)
321281
platforms: $(platforms)
322282

323283
# Cilium Podsubnet E2E tests

0 commit comments

Comments
 (0)