Skip to content

Commit 30b21ab

Browse files
committed
ci: disable swiftv2 E2E
1 parent eae2691 commit 30b21ab

File tree

2 files changed

+2
-87
lines changed

2 files changed

+2
-87
lines changed

.pipelines/pipeline.yaml

Lines changed: 1 addition & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -347,32 +347,6 @@ stages:
347347
scaleup: 50
348348
dependsOn: "containerize"
349349

350-
# CNI dual stack overlay E2E tests
351-
- template: singletenancy/dualstack-overlay/dualstackoverlay-e2e-job-template.yaml
352-
parameters:
353-
name: "dualstackoverlay_e2e"
354-
displayName: AKS DualStack Overlay
355-
os: linux
356-
clusterType: dualstack-overlay-byocni-up
357-
clusterName: "dsovere2e"
358-
vmSize: Standard_B2ms
359-
dependsOn: "containerize"
360-
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-
376350
- stage: delete
377351
displayName: Delete Clusters
378352
condition: always()
@@ -390,7 +364,6 @@ stages:
390364
- aks_windows_22_e2e
391365
- dualstackoverlay_e2e
392366
- cilium_dualstackoverlay_e2e
393-
- swiftv2_e2e
394367
variables:
395368
commitID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
396369
jobs:
@@ -403,7 +376,7 @@ stages:
403376
cilium_e2e:
404377
name: cilium_e2e
405378
clusterName: "ciliume2e"
406-
region: $(REGION_AKS_CLUSTER_TEST)
379+
region: $(REGION_AKS_CLUSTER_TEST)
407380
cilium_nodesubnet_e2e:
408381
name: cilium_nodesubnet_e2e
409382
clusterName: "cilndsubnete2e"
@@ -456,26 +429,3 @@ stages:
456429
region: $(region)
457430
sub: $(SUB_AZURE_NETWORK_AGENT_BUILD_VALIDATIONS)
458431
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)

.pipelines/run-pipeline.yaml

Lines changed: 1 addition & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ parameters:
77
- name: triggerBuildReason
88
type: string
99
default: ''
10-
10+
1111
- name: triggerBuildGitRef
1212
type: string
1313
default: ''
@@ -389,32 +389,6 @@ stages:
389389
scaleup: 50
390390
dependsOn: "containerize"
391391

392-
# CNI dual stack overlay E2E tests
393-
- template: singletenancy/dualstack-overlay/dualstackoverlay-e2e.jobs.yaml@ACNTools
394-
parameters:
395-
name: "dualstackoverlay_e2e"
396-
displayName: AKS DualStack Overlay
397-
os: linux
398-
clusterType: dualstack-overlay-byocni-up
399-
clusterName: "dsovere2e"
400-
vmSize: Standard_B2ms
401-
dependsOn: "containerize"
402-
403-
# Swiftv2 E2E tests with multitenancy cluster start up
404-
- template: multitenancy/swiftv2-e2e.jobs.yaml@ACNTools
405-
parameters:
406-
name: "swiftv2_e2e"
407-
displayName: Swiftv2 Multitenancy
408-
os: linux
409-
clusterType: swiftv2-multitenancy-cluster-up
410-
clusterName: "mtacluster"
411-
nodePoolName: "mtapool"
412-
vmSize: $(SWIFTV2_MT_CLUSTER_SKU)
413-
dependsOn: "containerize"
414-
dummyClusterName: "swiftv2dummy"
415-
dummyClusterType: "swiftv2-dummy-cluster-up"
416-
dummyClusterDisplayName: Swiftv2 Multitenancy Dummy Cluster
417-
418392
- stage: delete
419393
displayName: Delete Clusters
420394
condition: always()
@@ -430,7 +404,6 @@ stages:
430404
- aks_windows_22_e2e
431405
- dualstackoverlay_e2e
432406
- cilium_dualstackoverlay_e2e
433-
- swiftv2_e2e
434407
variables:
435408
ACN_DIR: $(Build.SourcesDirectory)
436409
commitID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
@@ -483,14 +456,6 @@ stages:
483456
name: cilium_dualstackoverlay_e2e
484457
clusterName: "cildsovere2e"
485458
Suffix: cilium_dualstackoverlay_e2e
486-
swiftv2_e2e:
487-
name: swiftv2_e2e
488-
clusterName: "mtcluster"
489-
Suffix: swiftv2_e2e
490-
swiftv2_dummy_e2e:
491-
name: swiftv2_dummy_e2e
492-
clusterName: "swiftv2dummy"
493-
Suffix: swiftv2_dummy_e2e
494459
variables:
495460
STORAGE_ID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.StorageID'] ]
496461
ob_outputDirectory: $(Build.ArtifactStagingDirectory)

0 commit comments

Comments
 (0)