ci: Shift E2E cluster creation (#2862)

* ci: shift cluster creation * chore: change depends on for release test
Azure · Jul 19, 2024 · b29bdac · b29bdac
1 parent a33e357
commit b29bdac
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/.pipelines/cni/cilium/cilium-overlay-load-test-template.yaml b/.pipelines/cni/cilium/cilium-overlay-load-test-template.yaml
@@ -28,6 +28,7 @@ stages:
       commitID: $[ stagedependencies.setup.env.outputs['SetEnvVars.commitID'] ]
     dependsOn:
       - setup
+      - build_images
     displayName: "Create Cluster - ${{ parameters.clusterName }}"
     jobs:
       - job: create_aks_cluster_with_${{ parameters.name }}
@@ -112,7 +113,7 @@ stages:
                   else
                     envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset.yaml | kubectl apply -f -
                   fi
-                  
+
                   envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.yaml | kubectl apply -f -
                   kubectl get po -owide -A
 

diff --git a/.pipelines/cni/singletenancy/cniv1-template.yaml b/.pipelines/cni/singletenancy/cniv1-template.yaml
@@ -43,6 +43,7 @@ stages:
         name: $(BUILD_POOL_NAME_DEFAULT)
       dependsOn:
         - setup
+        - build_images
       displayName: "Create Cluster - ${{ parameters.clusterName }}"
       jobs:
         - job: create_aks_cluster_with_${{ parameters.name }}
@@ -75,6 +76,7 @@ stages:
         name: $(BUILD_POOL_NAME_DEFAULT)
       dependsOn:
         - setup
+        - build_images
       displayName: "Create Cluster - ${{ parameters.clusterName }}"
       jobs:
         - job: create_aks_cluster_with_${{ parameters.name }}

diff --git a/.pipelines/cni/singletenancy/cniv2-template.yaml b/.pipelines/cni/singletenancy/cniv2-template.yaml
@@ -43,6 +43,7 @@ stages:
         name: $(BUILD_POOL_NAME_DEFAULT)
       dependsOn:
         - setup
+        - build_images
       displayName: "Create Cluster - ${{ parameters.clusterName }}"
       jobs:
         - job: create_aks_cluster_with_${{ parameters.name }}
@@ -75,6 +76,7 @@ stages:
         name: $(BUILD_POOL_NAME_DEFAULT)
       dependsOn:
         - setup
+        - build_images
       displayName: "Create Cluster - ${{ parameters.clusterName }}"
       jobs:
         - job: create_aks_cluster_with_${{ parameters.name }}

diff --git a/.pipelines/pipeline.yaml b/.pipelines/pipeline.yaml
@@ -359,7 +359,7 @@ stages:
         clusterName: "ciliume2e"
         vmSize: Standard_B2ms
         k8sVersion: ""
-        dependsOn: "test"
+        dependsOn: "containerize"
 
     # Cilium Overlay E2E tests
     - template: singletenancy/cilium-overlay/cilium-overlay-e2e-job-template.yaml
@@ -370,7 +370,7 @@ stages:
         clusterName: "cilovere2e"
         vmSize: Standard_B2ms
         k8sVersion: ""
-        dependsOn: "test"
+        dependsOn: "containerize"
 
     # Cilium Dualstack Overlay E2E tests
     - template: singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-job-template.yaml
@@ -382,7 +382,7 @@ stages:
         clusterName: "cildsovere2e"
         vmSize: Standard_B2ms
         k8sVersion: ""
-        dependsOn: "test"
+        dependsOn: "containerize"
 
         # Cilium Overlay with hubble E2E tests
     - template: singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e-job-template.yaml
@@ -393,7 +393,7 @@ stages:
         clusterName: "cilwhleovere2e"
         vmSize: Standard_B2ms
         k8sVersion: ""
-        dependsOn: "test"
+        dependsOn: "containerize"
         testHubble: true
 
     # Azure Overlay E2E tests
@@ -406,7 +406,7 @@ stages:
         clusterName: "azovere2e"
         vmSize: Standard_B2ms
         k8sVersion: ""
-        dependsOn: "test"
+        dependsOn: "containerize"
 
     # AKS Swift E2E tests
     - template: singletenancy/aks-swift/e2e-job-template.yaml
@@ -418,7 +418,7 @@ stages:
         clusterName: "swifte2e"
         vmSize: Standard_B2ms
         k8sVersion: ""
-        dependsOn: "test"
+        dependsOn: "containerize"
 
     # AKS Swift Vnet Scale E2E tests
     - template: singletenancy/aks-swift/e2e-job-template.yaml
@@ -430,7 +430,7 @@ stages:
         clusterName: "vscaleswifte2e"
         vmSize: Standard_B2ms
         k8sVersion: "1.28"
-        dependsOn: "test"
+        dependsOn: "containerize"
 
     # CNIv1 E2E tests
     - template: singletenancy/aks/e2e-job-template.yaml
@@ -444,7 +444,7 @@ stages:
         vmSize: Standard_B2s
         k8sVersion: 1.25
         scaleup: 100
-        dependsOn: "test"
+        dependsOn: "containerize"
 
     - template: singletenancy/aks/e2e-job-template.yaml
       parameters:
@@ -457,7 +457,7 @@ stages:
         vmSize: Standard_B2ms
         os_version: "ltsc2022"
         scaleup: 50
-        dependsOn: "test"
+        dependsOn: "containerize"
 
     # CNI dual stack overlay E2E tests
     - template: singletenancy/dualstack-overlay/dualstackoverlay-e2e-job-template.yaml
@@ -468,7 +468,7 @@ stages:
         clusterType: dualstack-overlay-byocni-up
         clusterName: "dsovere2e"
         vmSize: Standard_B2ms
-        dependsOn: "test"
+        dependsOn: "containerize"
 
     # Swiftv2 E2E tests with multitenancy cluster start up
     - template: multitenancy/swiftv2-e2e-job-template.yaml
@@ -480,7 +480,7 @@ stages:
         clusterName: "mtacluster"
         nodePoolName: "mtapool"
         vmSize: $(SWIFTV2_MT_CLUSTER_SKU)
-        dependsOn: "test"
+        dependsOn: "containerize"
         dummyClusterName: "swiftv2dummy"
         dummyClusterType: "swiftv2-dummy-cluster-up"
         dummyClusterDisplayName: Swiftv2 Multitenancy Dummy Cluster