Skip to content

Commit eb27240

Browse files
authored
Remove sovereign cloud testing support (#9650)
1 parent 5bf108c commit eb27240

File tree

2 files changed

+5
-12
lines changed

2 files changed

+5
-12
lines changed

eng/common/pipelines/templates/jobs/prepare-pipelines.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
GenerateUnifiedWeekly: ''
2828
TestVariableGroups: ''
2929
TestServiceConnections: ''
30-
30+
3131
# Standard set of variable groups for the Azure SDK repositories
3232
AzureSDK_Maven_Release_Pipeline_Secrets: 1
3333
AzureSDK_Nuget_Release_Pipeline_Secrets: 13
@@ -53,7 +53,7 @@ jobs:
5353
- template: /eng/common/pipelines/templates/steps/install-pipeline-generation.yml
5454
- template: /eng/common/pipelines/templates/steps/set-default-branch.yml
5555

56-
- pwsh: |
56+
- pwsh: |
5757
Write-Host "Setting up pipeline variables"
5858
if ("${{ parameters.Repository }}" -match "Azure/azure-sdk-for-(?<prefix>[^-]*)(?<pr>-pr)?") {
5959
$prefix = $matches['prefix']
@@ -70,13 +70,13 @@ jobs:
7070
}
7171
else {
7272
Write-Error "Repository name '${{ parameters.Repository }}' is not in the expected format."
73-
exit 1
73+
exit 1
7474
}
7575
7676
$generatePublicCIPipeline = 'true'
7777
$generateUnifiedWeekly = 'false'
7878
79-
$testServiceConnections = '"Azure" "azure-sdk-tests" "azure-sdk-tests-china" "azure-sdk-tests-preview" "azure-sdk-tests-public" "azure-sdk-tests-usgov" "Azure SDK Test Resources - LiveTestSecrets"'
79+
$testServiceConnections = '"Azure" "azure-sdk-tests" "azure-sdk-tests-preview" "azure-sdk-tests-public" "Azure SDK Test Resources - LiveTestSecrets"'
8080
$internalServiceConnections = '"Azure" "Azure SDK Artifacts" "Azure SDK Engineering System" "opensource-api-connection" "AzureSDKEngKeyVault Secrets"'
8181
8282
# Map the language prefix to the appropriate variable groups
@@ -126,7 +126,7 @@ jobs:
126126
Write-Host "InternalServiceConnections = $internalServiceConnections"
127127
Write-Host "GeneratePublicCIPipeline = $generatePublicCIPipeline"
128128
Write-Host "GenerateUnifiedWeekly = $generateUnifiedWeekly"
129-
129+
130130
Write-Host "##vso[task.setvariable variable=InternalVariableGroups]$internalVariableGroups"
131131
Write-Host "##vso[task.setvariable variable=TestVariableGroups]$testVariableGroups"
132132
Write-Host "##vso[task.setvariable variable=TestServiceConnections]$testServiceConnections"

eng/pipelines/live-test-cleanup.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,6 @@ parameters:
2020
- DisplayName: AzureCloud - Resource Cleanup
2121
ServiceConnection: azure-sdk-tests
2222
AdditionalParameters: "-DeleteNonCompliantGroups -DeleteArmDeployments"
23-
# This tenant has been disabled for now so removing it from clean-up
24-
# - DisplayName: AzureUSGovernment - Resource Cleanup
25-
# ServiceConnection: azure-sdk-tests-usgov
26-
# TODO: Enable strict resource cleanup after pre-existing static groups have been handled
27-
# AdditionalParameters: "-DeleteNonCompliantGroups"
28-
- DisplayName: AzureChinaCloud - Resource Cleanup
29-
ServiceConnection: azure-sdk-tests-china
3023
# TODO: Enable strict resource cleanup after pre-existing static groups have been handled
3124
# AdditionalParameters: "-DeleteNonCompliantGroups"
3225
- DisplayName: AzureCloud Playground - Resource Cleanup

0 commit comments

Comments
 (0)