Skip to content

Commit b29bdac

Browse files
authored
ci: Shift E2E cluster creation (#2862)
* ci: shift cluster creation * chore: change depends on for release test
1 parent a33e357 commit b29bdac

File tree

4 files changed

+17
-12
lines changed

4 files changed

+17
-12
lines changed

.pipelines/cni/cilium/cilium-overlay-load-test-template.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ stages:
2828
commitID: $[ stagedependencies.setup.env.outputs['SetEnvVars.commitID'] ]
2929
dependsOn:
3030
- setup
31+
- build_images
3132
displayName: "Create Cluster - ${{ parameters.clusterName }}"
3233
jobs:
3334
- job: create_aks_cluster_with_${{ parameters.name }}
@@ -112,7 +113,7 @@ stages:
112113
else
113114
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset.yaml | kubectl apply -f -
114115
fi
115-
116+
116117
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.yaml | kubectl apply -f -
117118
kubectl get po -owide -A
118119

.pipelines/cni/singletenancy/cniv1-template.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ stages:
4343
name: $(BUILD_POOL_NAME_DEFAULT)
4444
dependsOn:
4545
- setup
46+
- build_images
4647
displayName: "Create Cluster - ${{ parameters.clusterName }}"
4748
jobs:
4849
- job: create_aks_cluster_with_${{ parameters.name }}
@@ -75,6 +76,7 @@ stages:
7576
name: $(BUILD_POOL_NAME_DEFAULT)
7677
dependsOn:
7778
- setup
79+
- build_images
7880
displayName: "Create Cluster - ${{ parameters.clusterName }}"
7981
jobs:
8082
- job: create_aks_cluster_with_${{ parameters.name }}

.pipelines/cni/singletenancy/cniv2-template.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ stages:
4343
name: $(BUILD_POOL_NAME_DEFAULT)
4444
dependsOn:
4545
- setup
46+
- build_images
4647
displayName: "Create Cluster - ${{ parameters.clusterName }}"
4748
jobs:
4849
- job: create_aks_cluster_with_${{ parameters.name }}
@@ -75,6 +76,7 @@ stages:
7576
name: $(BUILD_POOL_NAME_DEFAULT)
7677
dependsOn:
7778
- setup
79+
- build_images
7880
displayName: "Create Cluster - ${{ parameters.clusterName }}"
7981
jobs:
8082
- job: create_aks_cluster_with_${{ parameters.name }}

.pipelines/pipeline.yaml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ stages:
359359
clusterName: "ciliume2e"
360360
vmSize: Standard_B2ms
361361
k8sVersion: ""
362-
dependsOn: "test"
362+
dependsOn: "containerize"
363363

364364
# Cilium Overlay E2E tests
365365
- template: singletenancy/cilium-overlay/cilium-overlay-e2e-job-template.yaml
@@ -370,7 +370,7 @@ stages:
370370
clusterName: "cilovere2e"
371371
vmSize: Standard_B2ms
372372
k8sVersion: ""
373-
dependsOn: "test"
373+
dependsOn: "containerize"
374374

375375
# Cilium Dualstack Overlay E2E tests
376376
- template: singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-job-template.yaml
@@ -382,7 +382,7 @@ stages:
382382
clusterName: "cildsovere2e"
383383
vmSize: Standard_B2ms
384384
k8sVersion: ""
385-
dependsOn: "test"
385+
dependsOn: "containerize"
386386

387387
# Cilium Overlay with hubble E2E tests
388388
- template: singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e-job-template.yaml
@@ -393,7 +393,7 @@ stages:
393393
clusterName: "cilwhleovere2e"
394394
vmSize: Standard_B2ms
395395
k8sVersion: ""
396-
dependsOn: "test"
396+
dependsOn: "containerize"
397397
testHubble: true
398398

399399
# Azure Overlay E2E tests
@@ -406,7 +406,7 @@ stages:
406406
clusterName: "azovere2e"
407407
vmSize: Standard_B2ms
408408
k8sVersion: ""
409-
dependsOn: "test"
409+
dependsOn: "containerize"
410410

411411
# AKS Swift E2E tests
412412
- template: singletenancy/aks-swift/e2e-job-template.yaml
@@ -418,7 +418,7 @@ stages:
418418
clusterName: "swifte2e"
419419
vmSize: Standard_B2ms
420420
k8sVersion: ""
421-
dependsOn: "test"
421+
dependsOn: "containerize"
422422

423423
# AKS Swift Vnet Scale E2E tests
424424
- template: singletenancy/aks-swift/e2e-job-template.yaml
@@ -430,7 +430,7 @@ stages:
430430
clusterName: "vscaleswifte2e"
431431
vmSize: Standard_B2ms
432432
k8sVersion: "1.28"
433-
dependsOn: "test"
433+
dependsOn: "containerize"
434434

435435
# CNIv1 E2E tests
436436
- template: singletenancy/aks/e2e-job-template.yaml
@@ -444,7 +444,7 @@ stages:
444444
vmSize: Standard_B2s
445445
k8sVersion: 1.25
446446
scaleup: 100
447-
dependsOn: "test"
447+
dependsOn: "containerize"
448448

449449
- template: singletenancy/aks/e2e-job-template.yaml
450450
parameters:
@@ -457,7 +457,7 @@ stages:
457457
vmSize: Standard_B2ms
458458
os_version: "ltsc2022"
459459
scaleup: 50
460-
dependsOn: "test"
460+
dependsOn: "containerize"
461461

462462
# CNI dual stack overlay E2E tests
463463
- template: singletenancy/dualstack-overlay/dualstackoverlay-e2e-job-template.yaml
@@ -468,7 +468,7 @@ stages:
468468
clusterType: dualstack-overlay-byocni-up
469469
clusterName: "dsovere2e"
470470
vmSize: Standard_B2ms
471-
dependsOn: "test"
471+
dependsOn: "containerize"
472472

473473
# Swiftv2 E2E tests with multitenancy cluster start up
474474
- template: multitenancy/swiftv2-e2e-job-template.yaml
@@ -480,7 +480,7 @@ stages:
480480
clusterName: "mtacluster"
481481
nodePoolName: "mtapool"
482482
vmSize: $(SWIFTV2_MT_CLUSTER_SKU)
483-
dependsOn: "test"
483+
dependsOn: "containerize"
484484
dummyClusterName: "swiftv2dummy"
485485
dummyClusterType: "swiftv2-dummy-cluster-up"
486486
dummyClusterDisplayName: Swiftv2 Multitenancy Dummy Cluster

0 commit comments

Comments
 (0)