From 46f877df4dac0dfd0860a8af3d075726ad40d6b1 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Mon, 21 Oct 2024 12:56:46 -0700 Subject: [PATCH] Move perf pipelines to TME subscription (#42501) Co-authored-by: Wes Haggard --- eng/common/TestResources/deploy-test-resources.yml | 2 +- eng/common/TestResources/remove-test-resources.yml | 2 +- .../TestResources/sub-config/AzureChinaMsft.json | 12 ------------ .../TestResources/sub-config/AzurePreviewMsft.json | 12 ------------ .../TestResources/sub-config/AzurePublicMsft.json | 12 ------------ .../TestResources/sub-config/AzureUsGovMsft.json | 12 ------------ eng/common/pipelines/templates/jobs/perf.yml | 10 ++-------- 7 files changed, 4 insertions(+), 58 deletions(-) delete mode 100644 eng/common/TestResources/sub-config/AzureChinaMsft.json delete mode 100644 eng/common/TestResources/sub-config/AzurePreviewMsft.json delete mode 100644 eng/common/TestResources/sub-config/AzurePublicMsft.json delete mode 100644 eng/common/TestResources/sub-config/AzureUsGovMsft.json diff --git a/eng/common/TestResources/deploy-test-resources.yml b/eng/common/TestResources/deploy-test-resources.yml index cba2c3e28d60f..19688919ae34f 100644 --- a/eng/common/TestResources/deploy-test-resources.yml +++ b/eng/common/TestResources/deploy-test-resources.yml @@ -7,7 +7,7 @@ parameters: SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources) ServiceConnection: not-specified ResourceType: test - UseFederatedAuth: false + UseFederatedAuth: true PersistOidcToken: false # SubscriptionConfiguration will be splatted into the parameters of the test diff --git a/eng/common/TestResources/remove-test-resources.yml b/eng/common/TestResources/remove-test-resources.yml index 025e90dd4c297..6516de505a6c5 100644 --- a/eng/common/TestResources/remove-test-resources.yml +++ b/eng/common/TestResources/remove-test-resources.yml @@ -7,7 +7,7 @@ parameters: ServiceConnection: not-specified ResourceType: test EnvVars: {} - UseFederatedAuth: false + UseFederatedAuth: true # SubscriptionConfiguration will be splat into the parameters of the test # resources script. It should be JSON in the form: diff --git a/eng/common/TestResources/sub-config/AzureChinaMsft.json b/eng/common/TestResources/sub-config/AzureChinaMsft.json deleted file mode 100644 index bd555f7af4973..0000000000000 --- a/eng/common/TestResources/sub-config/AzureChinaMsft.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "SubscriptionId": "44b2f395-b47b-462a-9a40-6ec719b6b910", - "TenantId": "3d0a72e2-8b06-4528-98df-1391c6f12c11", - "TestApplicationId": "5296eef3-d187-4e3e-bd80-7a05c38c389b", - "TestApplicationSecret": "", - "TestApplicationOid": "0d7672d5-e1db-42d4-a85e-add73010cfe5", - "ProvisionerApplicationId": "5296eef3-d187-4e3e-bd80-7a05c38c389b", - "ProvisionerApplicationSecret": "", - "ProvisionerApplicationOid": "0d7672d5-e1db-42d4-a85e-add73010cfe5", - "Environment": "AzureChinaCloud", - "AzureSubscription": "azuresdkchina" -} diff --git a/eng/common/TestResources/sub-config/AzurePreviewMsft.json b/eng/common/TestResources/sub-config/AzurePreviewMsft.json deleted file mode 100644 index 318baefab3a25..0000000000000 --- a/eng/common/TestResources/sub-config/AzurePreviewMsft.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "SubscriptionId": "23fddbc8-cb64-4b59-ba97-4c9f77c212e4", - "TenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47", - "TestApplicationId": "f850650c-1fcf-4489-b46f-71af2e30d360", - "TestApplicationSecret": "", - "TestApplicationOid": "30511c9d-ba1a-4c7b-b422-5b543da11b3f", - "ProvisionerApplicationId": "f850650c-1fcf-4489-b46f-71af2e30d360", - "ProvisionerApplicationSecret": "", - "ProvisionerApplicationOid": "30511c9d-ba1a-4c7b-b422-5b543da11b3f", - "Environment": "AzureCloud", - "AzureSubscription": "Azure SDK Test Resources - Preview" -} diff --git a/eng/common/TestResources/sub-config/AzurePublicMsft.json b/eng/common/TestResources/sub-config/AzurePublicMsft.json deleted file mode 100644 index 3a1a085e13bed..0000000000000 --- a/eng/common/TestResources/sub-config/AzurePublicMsft.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "SubscriptionId": "2cd617ea-1866-46b1-90e3-fffb087ebf9b", - "TenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47", - "TestApplicationId": "f850650c-1fcf-4489-b46f-71af2e30d360", - "TestApplicationSecret": "", - "TestApplicationOid": "30511c9d-ba1a-4c7b-b422-5b543da11b3f", - "ProvisionerApplicationId": "f850650c-1fcf-4489-b46f-71af2e30d360", - "ProvisionerApplicationSecret": "", - "ProvisionerApplicationOid": "30511c9d-ba1a-4c7b-b422-5b543da11b3f", - "Environment": "AzureCloud", - "AzureSubscription": "Azure SDK Test Resources" -} \ No newline at end of file diff --git a/eng/common/TestResources/sub-config/AzureUsGovMsft.json b/eng/common/TestResources/sub-config/AzureUsGovMsft.json deleted file mode 100644 index 97fedb95c9503..0000000000000 --- a/eng/common/TestResources/sub-config/AzureUsGovMsft.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "SubscriptionId": "4ad9eeaf-9573-4288-8357-1445436f34cd", - "TenantId": "63296244-ce2c-46d8-bc36-3e558792fbee", - "TestApplicationId": "48104cb1-6c74-4857-a8b6-f44d5cf43438", - "TestApplicationSecret": "", - "TestApplicationOid": "431d66d1-2713-4135-a0b6-28ea5abd3411", - "ProvisionerApplicationId": "48104cb1-6c74-4857-a8b6-f44d5cf43438", - "ProvisionerApplicationSecret": "", - "ProvisionerApplicationOid": "431d66d1-2713-4135-a0b6-28ea5abd3411", - "Environment": "AzureUSGovernment", - "AzureSubscription": "azuresdkgov" -} diff --git a/eng/common/pipelines/templates/jobs/perf.yml b/eng/common/pipelines/templates/jobs/perf.yml index 71df4bb1a3ecb..20ad5de1c7891 100644 --- a/eng/common/pipelines/templates/jobs/perf.yml +++ b/eng/common/pipelines/templates/jobs/perf.yml @@ -120,10 +120,7 @@ jobs: ServiceDirectory: ${{ parameters.ServiceDirectory }} Location: westus ResourceType: perf - ServiceConnection: azure-sdk-tests - SubscriptionConfigurationFilePaths: - - eng/common/TestResources/sub-config/AzurePublicMsft.json - UseFederatedAuth: true + ServiceConnection: azure-sdk-tests-public - script: >- dotnet run -- run @@ -183,7 +180,4 @@ jobs: parameters: ServiceDirectory: ${{ parameters.ServiceDirectory }} ResourceType: perf - ServiceConnection: azure-sdk-tests - SubscriptionConfigurationFilePaths: - - eng/common/TestResources/sub-config/AzurePublicMsft.json - UseFederatedAuth: true + ServiceConnection: azure-sdk-tests-public