Skip to content

Commit cf7f359

Browse files
authored
ci: reorganize pipeline stages (#4061)
* shortcircuit ut * test multi dependency * split npm manifest out * remove dependency of create cluster on build images in acn pr pipeline the images should only be required during the e2e stage after cluster creation the e2e stage is already dependent on publish multiarch manifests, which is already dependent on build images; thus, all e2e stages are implictly dependent on the build image stage success
1 parent 773b728 commit cf7f359

File tree

1 file changed

+30
-20
lines changed

1 file changed

+30
-20
lines changed

.pipelines/pipeline.yaml

Lines changed: 30 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ stages:
6565
displayName: Build Binaries
6666
dependsOn:
6767
- setup
68-
- test
6968
jobs:
7069
- job: build
7170
displayName: Build Binaries
@@ -106,7 +105,6 @@ stages:
106105
displayName: Build Images
107106
dependsOn:
108107
- setup
109-
- test
110108
jobs:
111109
- job: containerize_amd64
112110
displayName: Build Images
@@ -231,9 +229,6 @@ stages:
231229
ipv6_hp_bpf:
232230
name: ipv6-hp-bpf
233231
platforms: linux/amd64 linux/arm64
234-
npm:
235-
name: npm
236-
platforms: linux/amd64 linux/arm64 windows/amd64
237232
azure_ip_masq_merger:
238233
name: azure-ip-masq-merger
239234
platforms: linux/amd64 linux/arm64
@@ -245,6 +240,21 @@ stages:
245240
parameters:
246241
name: $(name)
247242
platforms: $(platforms)
243+
244+
- stage: publish_npm
245+
displayName: Publish NPM Multiarch Manifest
246+
dependsOn:
247+
- containerize
248+
jobs:
249+
- job: npm_manifest
250+
displayName: Compile NPM Manifest
251+
pool:
252+
name: "$(BUILD_POOL_NAME_DEFAULT)"
253+
steps:
254+
- template: containers/manifest-template.yaml
255+
parameters:
256+
name: npm
257+
platforms: linux/amd64 linux/arm64 windows/amd64
248258

249259
# Cilium Podsubnet E2E tests
250260
- template: singletenancy/cilium/cilium-e2e-job-template.yaml
@@ -255,7 +265,7 @@ stages:
255265
clusterName: "ciliume2e"
256266
vmSize: Standard_B2ms
257267
k8sVersion: ""
258-
dependsOn: "containerize"
268+
dependsOn: ["test"]
259269

260270
# Cilium Podsubnet Vnet Scale E2E tests
261271
- template: singletenancy/cilium/cilium-e2e-job-template.yaml
@@ -267,7 +277,7 @@ stages:
267277
clusterName: "ciliumvscalee2e"
268278
vmSize: Standard_B2ms
269279
k8sVersion: ""
270-
dependsOn: "containerize"
280+
dependsOn: ["test"]
271281

272282

273283
# Cilium Nodesubnet E2E tests
@@ -279,7 +289,7 @@ stages:
279289
clusterName: "cilndsubnete2e"
280290
vmSize: Standard_B2s
281291
k8sVersion: ""
282-
dependsOn: "containerize"
292+
dependsOn: ["test"]
283293

284294
# Cilium Overlay E2E tests
285295
- template: singletenancy/cilium-overlay/cilium-overlay-e2e-job-template.yaml
@@ -290,7 +300,7 @@ stages:
290300
clusterName: "cilovere2e"
291301
vmSize: Standard_B2ms
292302
k8sVersion: ""
293-
dependsOn: "containerize"
303+
dependsOn: ["test"]
294304

295305
# Cilium Dualstack Overlay E2E tests
296306
- template: singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-job-template.yaml
@@ -302,7 +312,7 @@ stages:
302312
clusterName: "cildsovere2e"
303313
vmSize: Standard_B2ms
304314
k8sVersion: ""
305-
dependsOn: "containerize"
315+
dependsOn: ["test"]
306316

307317
# Cilium Overlay with hubble E2E tests
308318
- template: singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e-job-template.yaml
@@ -313,7 +323,7 @@ stages:
313323
clusterName: "cilwhleovere2e"
314324
vmSize: Standard_B2ms
315325
k8sVersion: ""
316-
dependsOn: "containerize"
326+
dependsOn: ["test"]
317327
testHubble: true
318328

319329
# Azure Overlay E2E tests
@@ -326,7 +336,7 @@ stages:
326336
clusterName: "linuxazovere2e"
327337
vmSize: Standard_B2ms
328338
k8sVersion: ""
329-
dependsOn: "containerize"
339+
dependsOn: ["test"]
330340
scaleup: 100
331341

332342
- template: singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-job-template.yaml
@@ -338,7 +348,7 @@ stages:
338348
clusterName: "winazovere2e"
339349
vmSize: Standard_B2ms
340350
k8sVersion: ""
341-
dependsOn: "containerize"
351+
dependsOn: ["test"]
342352
scaleup: 50
343353

344354
# Azure Overlay E2E Stateless CNI tests
@@ -350,7 +360,7 @@ stages:
350360
clusterType: overlay-byocni-up
351361
clusterName: "statelesswin"
352362
vmSize: Standard_B2ms
353-
dependsOn: "containerize"
363+
dependsOn: ["test"]
354364

355365
# AKS Swift E2E tests
356366
- template: singletenancy/aks-swift/e2e-job-template.yaml
@@ -362,7 +372,7 @@ stages:
362372
clusterName: "swifte2e"
363373
vmSize: Standard_B2ms
364374
k8sVersion: ""
365-
dependsOn: "containerize"
375+
dependsOn: ["test"]
366376

367377
# AKS Swift Vnet Scale E2E tests
368378
- template: singletenancy/aks-swift/e2e-job-template.yaml
@@ -374,7 +384,7 @@ stages:
374384
clusterName: "vscaleswifte2e"
375385
vmSize: Standard_B2ms
376386
k8sVersion: "1.30"
377-
dependsOn: "containerize"
387+
dependsOn: ["test"]
378388

379389
# CNIv1 E2E tests
380390
- template: singletenancy/aks/e2e-job-template.yaml
@@ -388,7 +398,7 @@ stages:
388398
vmSize: Standard_B2s
389399
k8sVersion: 1.25
390400
scaleup: 100
391-
dependsOn: "containerize"
401+
dependsOn: ["test"]
392402

393403
- template: singletenancy/aks/e2e-job-template.yaml
394404
parameters:
@@ -401,7 +411,7 @@ stages:
401411
vmSize: Standard_B2ms
402412
os_version: "ltsc2022"
403413
scaleup: 50
404-
dependsOn: "containerize"
414+
dependsOn: ["test"]
405415

406416
# CNI dual stack overlay E2E tests
407417
- template: singletenancy/dualstack-overlay/dualstackoverlay-e2e-job-template.yaml
@@ -412,7 +422,7 @@ stages:
412422
clusterType: dualstack-overlay-byocni-up
413423
clusterName: "linuxdsovere2e"
414424
vmSize: Standard_B2ms
415-
dependsOn: "containerize"
425+
dependsOn: ["test"]
416426
scaleup: 100
417427

418428
- template: singletenancy/dualstack-overlay/dualstackoverlay-e2e-job-template.yaml
@@ -423,7 +433,7 @@ stages:
423433
clusterType: dualstack-overlay-byocni-up
424434
clusterName: "windsovere2e"
425435
vmSize: Standard_B2ms
426-
dependsOn: "containerize"
436+
dependsOn: ["test"]
427437
scaleup: 50
428438

429439
- stage: delete

0 commit comments

Comments
 (0)