Skip to content

remove zane clusters #1660

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zanejohnson-azure merged 1 commit into from
Apr 28, 2026
+8 −65
Merged

remove zane clusters #1660

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 8 additions & 65 deletions .pipelines/azure_pipeline_mergedbranches.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -897,65 +897,8 @@ extends:
linuxImageTagUnderTest: $[stageDependencies.stage.common.outputs['setup.linuxImagetag']]
windowsImageTagUnderTest: $[stageDependencies.stage.common.outputs['setup.windowsImageTag']]
jobs:
# TODO: remomve the two temp cluster and add more clusters from test automation framework when the tests are stable
# ============================================================
# Cluster 1: zane-test — Deploy via Helm
# ============================================================
- template: /.pipelines/helm-deploy-templates/ama-logs-helm-deploy.yaml@self
parameters:
clusterName: 'zane-test'
resourceGroup: 'zane-test'
region: 'westus2'
subscriptionId: $(CI_BUILD_SUB_ID)
workspaceId: $(ZANE_TEST_LA2_LAW_ID) # zane-test-la2
amalogsLinuxImage: $(linuxImageTagUnderTest)
amalogsWindowsImage: $(windowsImageTagUnderTest)
imageRepository: $(ImageRepositoryOverride)
environment: 'CI-Agent-Dev'
azureSubscription: 'ContainerInsights_Build_Subscription_CI'

# Cluster 1: zane-test — Run E2E Tests
- template: /.pipelines/e2e-test-templates/test-ci-image-in-aks-cluster.yml@self
parameters:
clusterName: 'zane-test'
resourceGroup: 'zane-test'
azureSubscription: 'ContainerInsights_Build_Subscription_CI'
environmentName: 'CI-Agent-Dev'
dependsOnDeployJob: 'Deploy_AmaLogs_zane_test'
azureClientId: $(ZANE_TEST_CLIENT_ID)
azureTenantId: $(CI_BUILD_AZURE_TENANT_ID)
teamsWebhookUri: $(TeamsWebhookUri)

# ============================================================
# Cluster 2: zane-test2 — Deploy via Helm
# ============================================================
- template: /.pipelines/helm-deploy-templates/ama-logs-helm-deploy.yaml@self
parameters:
clusterName: 'zane-test2'
resourceGroup: 'zane-test'
region: 'centralus'
subscriptionId: $(CI_BUILD_SUB_ID)
workspaceId: $(ZANE_TEST_LA2_LAW_ID) # zane-test2-la2
amalogsLinuxImage: $(linuxImageTagUnderTest)
amalogsWindowsImage: $(windowsImageTagUnderTest)
imageRepository: $(ImageRepositoryOverride)
environment: 'CI-Agent-Dev2'
azureSubscription: 'ContainerInsights_Build_Subscription_CI'

# Cluster 2: zane-test2 — Run E2E Tests
- template: /.pipelines/e2e-test-templates/test-ci-image-in-aks-cluster.yml@self
parameters:
clusterName: 'zane-test2'
resourceGroup: 'zane-test'
azureSubscription: 'ContainerInsights_Build_Subscription_CI'
environmentName: 'CI-Agent-Dev2'
dependsOnDeployJob: 'Deploy_AmaLogs_zane_test2'
azureClientId: $(ZANE_TEST2_CLIENT_ID)
azureTenantId: $(CI_BUILD_AZURE_TENANT_ID)
teamsWebhookUri: $(TeamsWebhookUri)

# ============================================================
# Cluster 3: ci-logs-prod-aks-geneva-integration-multi-tenancy — Deploy via Helm
# Cluster: ci-logs-prod-aks-geneva-integration-multi-tenancy — Deploy via Helm
# ============================================================
- template: /.pipelines/helm-deploy-templates/ama-logs-helm-deploy.yaml@self
parameters:
Expand All @@ -970,7 +913,7 @@ extends:
environment: 'CI-Agent-GenevaIntegrationMultiTenancy'
azureSubscription: 'ContainerInsights_Build_Subscription_CI'

# Cluster 3: ci-logs-prod-aks-geneva-integration-multi-tenancy — Run E2E Tests
# Cluster: ci-logs-prod-aks-geneva-integration-multi-tenancy — Run E2E Tests
- template: /.pipelines/e2e-test-templates/test-ci-image-in-aks-cluster.yml@self
parameters:
clusterName: 'ci-logs-prod-aks-geneva-integration-multi-tenancy'
Expand All @@ -984,7 +927,7 @@ extends:
additionalTestParams: 'GenevaIntegration=true'

# ============================================================
# Cluster 4: ci-logs-prod-aks-work-load-identity — Deploy via Helm
# Cluster: ci-logs-prod-aks-work-load-identity — Deploy via Helm
# ============================================================
- template: /.pipelines/helm-deploy-templates/ama-logs-helm-deploy.yaml@self
parameters:
Expand All @@ -999,7 +942,7 @@ extends:
environment: 'CI-Agent-WorkLoadIdentity'
azureSubscription: 'ContainerInsights_Build_Subscription_CI'

# Cluster 4: ci-logs-prod-aks-work-load-identity — Run E2E Tests
# Cluster: ci-logs-prod-aks-work-load-identity — Run E2E Tests
- template: /.pipelines/e2e-test-templates/test-ci-image-in-aks-cluster.yml@self
parameters:
clusterName: 'ci-logs-prod-aks-work-load-identity'
Expand All @@ -1013,7 +956,7 @@ extends:
additionalTestParams: 'LinuxTestsOnly=true'

# ============================================================
# Cluster 5: ci-logs-prod-wcus-fips — Deploy via Helm
# Cluster: ci-logs-prod-wcus-fips — Deploy via Helm
# ============================================================
- template: /.pipelines/helm-deploy-templates/ama-logs-helm-deploy.yaml@self
parameters:
Expand All @@ -1028,7 +971,7 @@ extends:
environment: 'CI-Agent-WcusFips'
azureSubscription: 'ContainerInsights_Build_Subscription_CI'

# Cluster 5: ci-logs-prod-wcus-fips — Run E2E Tests
# Cluster: ci-logs-prod-wcus-fips — Run E2E Tests
- template: /.pipelines/e2e-test-templates/test-ci-image-in-aks-cluster.yml@self
parameters:
clusterName: 'ci-logs-prod-wcus-fips'
Expand All @@ -1041,7 +984,7 @@ extends:
teamsWebhookUri: $(TeamsWebhookUri)

# ============================================================
# Cluster 6: ci-logs-prod-aks-networkflowlogs — Deploy via Helm
# Cluster: ci-logs-prod-aks-networkflowlogs — Deploy via Helm
# ============================================================
- template: /.pipelines/helm-deploy-templates/ama-logs-helm-deploy.yaml@self
parameters:
Expand All @@ -1058,7 +1001,7 @@ extends:
# TODO: Use OmsAgent.retinaFlowLogsEnabled=true once we use the merged chart
additionalOverrides: 'OmsAgent.isRetinaFlowLogsEnabled=true'

# Cluster 6: ci-logs-prod-aks-networkflowlogs — Run E2E Tests
# Cluster: ci-logs-prod-aks-networkflowlogs — Run E2E Tests
- template: /.pipelines/e2e-test-templates/test-ci-image-in-aks-cluster.yml@self
parameters:
clusterName: 'ci-logs-prod-aks-networkflowlogs'
Expand Down
Loading