Skip to content

Remove default sub config sub-config-azure-cloud-test-resources #9229

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
weshaggard merged 2 commits into from
Oct 22, 2024
Merged

Remove default sub config sub-config-azure-cloud-test-resources #9229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03dcd7c
Remove default sub config sub-config-azure-cloud-test-resources
weshaggard Oct 22, 2024
e7bd0a1
Fix quoting
weshaggard Oct 22, 2024
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
2 changes: 1 addition & 1 deletion doc/common/matrix_generator.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ jobs:
JobTemplatePath: /eng/common-tests/matrix-generator/samples/matrix-job-sample.yml
AdditionalParameters: []
CloudConfig:
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
ServiceConnection: azure-sdk-tests-public
Location: eastus2
Cloud: Public
MatrixFilters: []
Expand Down
2 changes: 1 addition & 1 deletion eng/common-tests/matrix-generator/samples/matrix-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
Pool: Azure Pipelines
OsVmImage: ubuntu-20.04
CloudConfig:
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
ServiceConnection: azure-sdk-tests-public
Location: eastus2
Cloud: Public
MatrixFilters:
Expand Down
2 changes: 1 addition & 1 deletion eng/common/TestResources/build-test-resource-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
parameters:
- name: SubscriptionConfiguration
type: string
default: $(sub-config-azure-cloud-test-resources)
default: '{}'
- name: SubscriptionConfigurations
type: object
default: null
Expand Down
3 changes: 1 addition & 2 deletions eng/common/TestResources/deploy-test-resources.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ parameters:
DeleteAfterHours: 8
Location: ''
EnvVars: {}
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
SubscriptionConfiguration: '{}'
ServiceConnection: not-specified
ResourceType: test
UseFederatedAuth: true
Expand Down Expand Up @@ -36,7 +36,6 @@ parameters:
# }
# }


steps:
- template: /eng/common/pipelines/templates/steps/cache-ps-modules.yml

Expand Down
2 changes: 1 addition & 1 deletion eng/common/TestResources/remove-test-resources.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

parameters:
ServiceDirectory: ''
SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
SubscriptionConfiguration: $(SubscriptionConfiguration)
Copy link
Member Author

@weshaggard weshaggard Oct 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've defaulted this because this is what deploy-test-resources outputs. It will fix the usages like we have in perf to ensure we have consistent configuration shared between deploy and remove. Should fix issue like https://dev.azure.com/azure-sdk/internal/_build/results?buildId=4252994&view=logs&j=42ded549-05ee-5cdb-7ba7-7a948a0cc056&t=b938c548-640d-5101-7a83-c666c2d131df

ServiceConnection: not-specified
ResourceType: test
EnvVars: {}
Expand Down
3 changes: 0 additions & 3 deletions eng/pipelines/live-test-cleanup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,13 @@ parameters:
- DisplayName: AzureCloud ACS - Resource Cleanup
ServiceConnection: azure-sdk-tests-communication
SubscriptionConfigurations:
- $(sub-config-azure-cloud-test-resources)
- $(sub-config-communication-services-cloud-test-resources-common)
- DisplayName: AzureCloud Cosmos - Resource Cleanup
ServiceConnection: azure-sdk-tests-cosmos
SubscriptionConfigurations:
- $(sub-config-azure-cloud-test-resources)
- $(sub-config-cosmos-azure-cloud-test-resources)
# - DisplayName: AzureCloud Storage NET - Resource Cleanup
# SubscriptionConfigurations:
# - $(sub-config-azure-cloud-test-resources)
# - $(sub-config-storage-test-resources-net)

stages:
Expand Down