@@ -358,21 +358,6 @@ stages:
358358 vmSize : Standard_B2ms
359359 dependsOn : " containerize"
360360
361- # Swiftv2 E2E tests with multitenancy cluster start up
362- - template : multitenancy/swiftv2-e2e-job-template.yaml
363- parameters :
364- name : " swiftv2_e2e"
365- displayName : Swiftv2 Multitenancy
366- os : linux
367- clusterType : swiftv2-multitenancy-cluster-up
368- clusterName : " mtacluster"
369- nodePoolName : " mtapool"
370- vmSize : $(SWIFTV2_MT_CLUSTER_SKU)
371- dependsOn : " containerize"
372- dummyClusterName : " swiftv2dummy"
373- dummyClusterType : " swiftv2-dummy-cluster-up"
374- dummyClusterDisplayName : Swiftv2 Multitenancy Dummy Cluster
375-
376361 - stage : delete
377362 displayName : Delete Clusters
378363 condition : always()
@@ -390,7 +375,6 @@ stages:
390375 - aks_windows_22_e2e
391376 - dualstackoverlay_e2e
392377 - cilium_dualstackoverlay_e2e
393- - swiftv2_e2e
394378 variables :
395379 commitID : $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
396380 jobs :
@@ -403,7 +387,7 @@ stages:
403387 cilium_e2e :
404388 name : cilium_e2e
405389 clusterName : " ciliume2e"
406- region : $(REGION_AKS_CLUSTER_TEST)
390+ region : $(REGION_AKS_CLUSTER_TEST)
407391 cilium_nodesubnet_e2e :
408392 name : cilium_nodesubnet_e2e
409393 clusterName : " cilndsubnete2e"
@@ -456,26 +440,3 @@ stages:
456440 region : $(region)
457441 sub : $(SUB_AZURE_NETWORK_AGENT_BUILD_VALIDATIONS)
458442 svcConn : $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
459-
460- - job : delete_test
461- displayName : Delete Cluster
462- pool :
463- name : " $(BUILD_POOL_NAME_DEFAULT)"
464- strategy :
465- matrix :
466- swiftv2_e2e :
467- name : swiftv2_e2e
468- clusterName : " mtacluster"
469- region : $(REGION_SWIFTV2_CLUSTER_TEST)
470- swiftv2_dummy_e2e :
471- name : swiftv2_dummy_e2e
472- clusterName : " swiftv2dummy"
473- region : $(REGION_SWIFTV2_CLUSTER_TEST)
474- steps :
475- - template : templates/delete-cluster.yaml
476- parameters :
477- name : $(name)
478- clusterName : $(clusterName)-$(commitID)
479- region : $(region)
480- sub : $(SUB_AZURE_NETWORK_AGENT_TEST)
481- svcConn : $(ACN_TEST_SERVICE_CONNECTION)
0 commit comments