Making skus Standard_D4s_v6

Author: pjohnst5

.pipelines/pipeline.yaml

@@ -257,7 +257,7 @@ stages:
         displayName: Cilium
         clusterType: swift-byocni-nokubeproxy-up
         clusterName: "ciliume2e"
-        vmSize: Standard_B2ms
+        vmSize: Standard_D4s_v6
         k8sVersion: ""
         dependsOn: "containerize"
 
@@ -268,7 +268,7 @@ stages:
         displayName: Cilium on AKS Overlay
         clusterType: overlay-byocni-nokubeproxy-up
         clusterName: "cilovere2e"
-        vmSize: Standard_B2ms
+        vmSize: Standard_D4s_v6
         k8sVersion: ""
         dependsOn: "containerize"
 
@@ -280,7 +280,7 @@ stages:
         os: linux
         clusterType: dualstack-byocni-nokubeproxy-up
         clusterName: "cildsovere2e"
-        vmSize: Standard_B2ms
+        vmSize: Standard_D4s_v6
         k8sVersion: ""
         dependsOn: "containerize"
 
@@ -291,7 +291,7 @@ stages:
         displayName: Cilium on AKS Overlay with Hubble
         clusterType: overlay-byocni-nokubeproxy-up
         clusterName: "cilwhleovere2e"
-        vmSize: Standard_B2ms
+        vmSize: Standard_D4s_v6
         k8sVersion: ""
         dependsOn: "containerize"
         testHubble: true
@@ -304,7 +304,7 @@ stages:
         os: linux
         clusterType: overlay-byocni-up
         clusterName: "azovere2e"
-        vmSize: Standard_B2ms
+        vmSize: Standard_D4s_v6
         k8sVersion: ""
         dependsOn: "containerize"
 
@@ -316,7 +316,7 @@ stages:
         os: windows
         clusterType: overlay-byocni-up
         clusterName: "statelesswin"
-        vmSize: Standard_B2ms
+        vmSize: Standard_D4s_v6
         dependsOn: "containerize"
 
     # AKS Swift E2E tests
@@ -327,7 +327,7 @@ stages:
         os: linux
         clusterType: swift-byocni-up
         clusterName: "swifte2e"
-        vmSize: Standard_B2ms
+        vmSize: Standard_D4s_v6
         k8sVersion: ""
         dependsOn: "containerize"
 
@@ -339,7 +339,7 @@ stages:
         os: linux
         clusterType: vnetscale-swift-byocni-up
         clusterName: "vscaleswifte2e"
-        vmSize: Standard_B2ms
+        vmSize: Standard_D4s_v6
         k8sVersion: "1.30"
         dependsOn: "containerize"
 
@@ -352,7 +352,7 @@ stages:
         os: "linux"
         clusterType: linux-cniv1-up
         clusterName: "ubuntu22e2e"
-        vmSize: Standard_B2s
+        vmSize: Standard_D4s_v6
         k8sVersion: 1.25
         scaleup: 100
         dependsOn: "containerize"
@@ -365,7 +365,7 @@ stages:
         os: windows
         clusterType: windows-cniv1-up
         clusterName: "win22e2e"
-        vmSize: Standard_B2ms
+        vmSize: Standard_D4s_v6
         os_version: "ltsc2022"
         scaleup: 50
         dependsOn: "containerize"
@@ -378,23 +378,23 @@ stages:
         os: linux
         clusterType: dualstack-overlay-byocni-up
         clusterName: "dsovere2e"
-        vmSize: Standard_B2ms
+        vmSize: Standard_D4s_v6
         dependsOn: "containerize"
 
     # Swiftv2 E2E tests with multitenancy cluster start up
-    - template: multitenancy/swiftv2-e2e-job-template.yaml
-      parameters:
-        name: "swiftv2_e2e"
-        displayName: Swiftv2 Multitenancy
-        os: linux
-        clusterType: swiftv2-multitenancy-cluster-up
-        clusterName: "mtacluster"
-        nodePoolName: "mtapool"
-        vmSize: $(SWIFTV2_MT_CLUSTER_SKU)
-        dependsOn: "containerize"
-        dummyClusterName: "swiftv2dummy"
-        dummyClusterType: "swiftv2-dummy-cluster-up"
-        dummyClusterDisplayName: Swiftv2 Multitenancy Dummy Cluster
+    # - template: multitenancy/swiftv2-e2e-job-template.yaml
+    #   parameters:
+    #     name: "swiftv2_e2e"
+    #     displayName: Swiftv2 Multitenancy
+    #     os: linux
+    #     clusterType: swiftv2-multitenancy-cluster-up
+    #     clusterName: "mtacluster"
+    #     nodePoolName: "mtapool"
+    #     vmSize: $(SWIFTV2_MT_CLUSTER_SKU)
+    #     dependsOn: "containerize"
+    #     dummyClusterName: "swiftv2dummy"
+    #     dummyClusterType: "swiftv2-dummy-cluster-up"
+    #     dummyClusterDisplayName: Swiftv2 Multitenancy Dummy Cluster
 
     - stage: delete
       displayName: Delete Clusters
@@ -412,7 +412,7 @@ stages:
         - aks_windows_22_e2e
         - dualstackoverlay_e2e
         - cilium_dualstackoverlay_e2e
-        - swiftv2_e2e
+        # - swiftv2_e2e
       variables:
         commitID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
       jobs:
@@ -475,25 +475,25 @@ stages:
                 sub: $(SUB_AZURE_NETWORK_AGENT_BUILD_VALIDATIONS)
                 svcConn: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
 
-        - job: delete_test
-          displayName: Delete Cluster
-          pool:
-            name: "$(BUILD_POOL_NAME_DEFAULT)"
-          strategy:
-            matrix:
-              swiftv2_e2e:
-                name: swiftv2_e2e
-                clusterName: "mtacluster"
-                region: $(REGION_SWIFTV2_CLUSTER_TEST)
-              swiftv2_dummy_e2e:
-                name: swiftv2_dummy_e2e
-                clusterName: "swiftv2dummy"
-                region: $(REGION_SWIFTV2_CLUSTER_TEST)
-          steps:
-            - template: templates/delete-cluster.yaml
-              parameters:
-                name: $(name)
-                clusterName: $(clusterName)-$(commitID)
-                region: $(region)
-                sub: $(SUB_AZURE_NETWORK_AGENT_TEST)
-                svcConn: $(ACN_TEST_SERVICE_CONNECTION)
+        # - job: delete_test
+        #   displayName: Delete Cluster
+        #   pool:
+        #     name: "$(BUILD_POOL_NAME_DEFAULT)"
+        #   strategy:
+        #     matrix:
+        #       swiftv2_e2e:
+        #         name: swiftv2_e2e
+        #         clusterName: "mtacluster"
+        #         region: $(REGION_SWIFTV2_CLUSTER_TEST)
+        #       swiftv2_dummy_e2e:
+        #         name: swiftv2_dummy_e2e
+        #         clusterName: "swiftv2dummy"
+        #         region: $(REGION_SWIFTV2_CLUSTER_TEST)
+        #   steps:
+        #     - template: templates/delete-cluster.yaml
+        #       parameters:
+        #         name: $(name)
+        #         clusterName: $(clusterName)-$(commitID)
+        #         region: $(region)
+        #         sub: $(SUB_AZURE_NETWORK_AGENT_TEST)
+        #         svcConn: $(ACN_TEST_SERVICE_CONNECTION)