From 9dd0388c16801adcbb14181e7926cbeea46fbcd5 Mon Sep 17 00:00:00 2001 From: rajuanitha88 Date: Sun, 7 Jul 2024 15:33:28 +0200 Subject: [PATCH 1/4] Using federated auth for ACS tests --- .../Azure.Communication.CallAutomation/tests.yml | 7 +++++-- .../Azure.Communication.CallingServer/tests.yml | 7 +++++-- sdk/communication/Azure.Communication.Chat/tests.yml | 7 +++++-- sdk/communication/Azure.Communication.Identity/tests.yml | 8 +++++--- sdk/communication/Azure.Communication.JobRouter/tests.yml | 7 +++++-- sdk/communication/Azure.Communication.Rooms/tests.yml | 5 ++++- .../Azure.Communication.ShortCodes/tests.yml | 6 +++++- 7 files changed, 34 insertions(+), 13 deletions(-) diff --git a/sdk/communication/Azure.Communication.CallAutomation/tests.yml b/sdk/communication/Azure.Communication.CallAutomation/tests.yml index 3779314d7f923..782f9b73512a9 100644 --- a/sdk/communication/Azure.Communication.CallAutomation/tests.yml +++ b/sdk/communication/Azure.Communication.CallAutomation/tests.yml @@ -5,10 +5,13 @@ extends: parameters: ServiceDirectory: communication Project: Azure.Communication.CallAutomation + UseFederatedAuth: true CloudConfig: Public: + ServiceConnection: azure-sdk-tests + SubscriptionConfigurationFilePaths: + - eng/common/TestResources/sub-config/AzurePublicMsft.json SubscriptionConfigurations: - - $(sub-config-azure-cloud-test-resources) - $(sub-config-communication-services-cloud-test-resources-common) - $(sub-config-communication-services-cloud-test-resources-net) Int: @@ -17,7 +20,7 @@ extends: - $(sub-config-communication-int-test-resources-net) Clouds: Public TestResourceDirectories: - - communication/test-resources/ + - communication/ EnvVars: # SKIP_CALLAUTOMATION_INTERACTION_LIVE_TESTS skips certain CallAutomation tests that required human interactions SKIP_CALLAUTOMATION_INTERACTION_LIVE_TESTS: TRUE diff --git a/sdk/communication/Azure.Communication.CallingServer/tests.yml b/sdk/communication/Azure.Communication.CallingServer/tests.yml index 65a3e080806ac..d07ea4040e651 100644 --- a/sdk/communication/Azure.Communication.CallingServer/tests.yml +++ b/sdk/communication/Azure.Communication.CallingServer/tests.yml @@ -5,10 +5,13 @@ extends: parameters: ServiceDirectory: communication Project: Azure.Communication.CallingServer + UseFederatedAuth: true CloudConfig: Public: + ServiceConnection: azure-sdk-tests + SubscriptionConfigurationFilePaths: + - eng/common/TestResources/sub-config/AzurePublicMsft.json SubscriptionConfigurations: - - $(sub-config-azure-cloud-test-resources) - $(sub-config-communication-services-cloud-test-resources-common) - $(sub-config-communication-services-cloud-test-resources-net) Int: @@ -17,7 +20,7 @@ extends: - $(sub-config-communication-int-test-resources-net) Clouds: Public TestResourceDirectories: - - communication/test-resources/ + - communication/ EnvVars: # SKIP_CALLINGSERVER_INTERACTION_LIVE_TESTS skips certain CallAutomation tests that required human interactions SKIP_CALLINGSERVER_INTERACTION_LIVE_TESTS: TRUE diff --git a/sdk/communication/Azure.Communication.Chat/tests.yml b/sdk/communication/Azure.Communication.Chat/tests.yml index bdd54f72ec1bc..5176b91957291 100644 --- a/sdk/communication/Azure.Communication.Chat/tests.yml +++ b/sdk/communication/Azure.Communication.Chat/tests.yml @@ -5,10 +5,13 @@ extends: parameters: ServiceDirectory: communication Project: Azure.Communication.Chat + UseFederatedAuth: true CloudConfig: Public: + ServiceConnection: azure-sdk-tests + SubscriptionConfigurationFilePaths: + - eng/common/TestResources/sub-config/AzurePublicMsft.json SubscriptionConfigurations: - - $(sub-config-azure-cloud-test-resources) - $(sub-config-communication-services-cloud-test-resources-common) - $(sub-config-communication-services-cloud-test-resources-net) PPE: @@ -21,4 +24,4 @@ extends: - $(sub-config-communication-int-test-resources-net) Clouds: Public,PPE,Int TestResourceDirectories: - - communication/test-resources/ + - communication/ diff --git a/sdk/communication/Azure.Communication.Identity/tests.yml b/sdk/communication/Azure.Communication.Identity/tests.yml index f5d0af456738e..58af760122366 100644 --- a/sdk/communication/Azure.Communication.Identity/tests.yml +++ b/sdk/communication/Azure.Communication.Identity/tests.yml @@ -5,12 +5,14 @@ extends: parameters: ServiceDirectory: communication Project: Azure.Communication.Identity + UseFederatedAuth: true CloudConfig: Public: + ServiceConnection: azure-sdk-tests + SubscriptionConfigurationFilePaths: + - eng/common/TestResources/sub-config/AzurePublicMsft.json SubscriptionConfigurations: - - $(sub-config-azure-cloud-test-resources) - - $(sub-config-communication-services-cloud-test-resources-common) - - $(sub-config-communication-services-cloud-test-resources-net) + - $(sub-config-communication-services-cloud-test-resources-cte) PPE: SubscriptionConfigurations: - $(sub-config-communication-ppe-test-resources-common) diff --git a/sdk/communication/Azure.Communication.JobRouter/tests.yml b/sdk/communication/Azure.Communication.JobRouter/tests.yml index 4d83873fbd761..823eb7090adb4 100644 --- a/sdk/communication/Azure.Communication.JobRouter/tests.yml +++ b/sdk/communication/Azure.Communication.JobRouter/tests.yml @@ -5,10 +5,13 @@ extends: parameters: ServiceDirectory: communication Project: Azure.Communication.JobRouter + UseFederatedAuth: true CloudConfig: Public: + ServiceConnection: azure-sdk-tests + SubscriptionConfigurationFilePaths: + - eng/common/TestResources/sub-config/AzurePublicMsft.json SubscriptionConfigurations: - - $(sub-config-azure-cloud-test-resources) - $(sub-config-communication-services-cloud-test-resources-common) - $(sub-config-communication-services-cloud-test-resources-net) Int: @@ -17,4 +20,4 @@ extends: - $(sub-config-communication-int-test-resources-net) Clouds: Public,Int TestResourceDirectories: - - communication/test-resources/ + - communication/ diff --git a/sdk/communication/Azure.Communication.Rooms/tests.yml b/sdk/communication/Azure.Communication.Rooms/tests.yml index 8c31b8b8096e6..32e8c04a68610 100644 --- a/sdk/communication/Azure.Communication.Rooms/tests.yml +++ b/sdk/communication/Azure.Communication.Rooms/tests.yml @@ -5,10 +5,13 @@ extends: parameters: ServiceDirectory: communication Project: Azure.Communication.Rooms + UseFederatedAuth: true CloudConfig: Public: + ServiceConnection: azure-sdk-tests + SubscriptionConfigurationFilePaths: + - eng/common/TestResources/sub-config/AzurePublicMsft.json SubscriptionConfigurations: - - $(sub-config-azure-cloud-test-resources) - $(sub-config-communication-services-cloud-test-resources-common) - $(sub-config-communication-services-cloud-test-resources-net) PPE: diff --git a/sdk/communication/Azure.Communication.ShortCodes/tests.yml b/sdk/communication/Azure.Communication.ShortCodes/tests.yml index f7a1506037a06..ea60deafb6cb1 100644 --- a/sdk/communication/Azure.Communication.ShortCodes/tests.yml +++ b/sdk/communication/Azure.Communication.ShortCodes/tests.yml @@ -5,8 +5,12 @@ extends: parameters: ServiceDirectory: communication Project: Azure.Communication.ShortCodes + UseFederatedAuth: true CloudConfig: Public: + ServiceConnection: azure-sdk-tests + SubscriptionConfigurationFilePaths: + - eng/common/TestResources/sub-config/AzurePublicMsft.json SubscriptionConfigurations: - $(sub-config-azure-cloud-test-resources) - $(sub-config-communication-services-cloud-test-resources-common) @@ -17,4 +21,4 @@ extends: - $(sub-config-communication-int-test-resources-net) Clouds: Public,Int TestResourceDirectories: - - communication/test-resources/ + - communication/ From 0783c436c79af9b126813a831d73ee3b2488cbaa Mon Sep 17 00:00:00 2001 From: rajuanitha88 Date: Sun, 7 Jul 2024 15:37:24 +0200 Subject: [PATCH 2/4] Removing usage of secrets for Shortcodes --- sdk/communication/Azure.Communication.ShortCodes/tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/sdk/communication/Azure.Communication.ShortCodes/tests.yml b/sdk/communication/Azure.Communication.ShortCodes/tests.yml index ea60deafb6cb1..683ba29b45590 100644 --- a/sdk/communication/Azure.Communication.ShortCodes/tests.yml +++ b/sdk/communication/Azure.Communication.ShortCodes/tests.yml @@ -12,7 +12,6 @@ extends: SubscriptionConfigurationFilePaths: - eng/common/TestResources/sub-config/AzurePublicMsft.json SubscriptionConfigurations: - - $(sub-config-azure-cloud-test-resources) - $(sub-config-communication-services-cloud-test-resources-common) - $(sub-config-communication-services-cloud-test-resources-net) Int: From 51f6dde36879d7a04aa323d53437fb3b229f8787 Mon Sep 17 00:00:00 2001 From: rajuanitha88 Date: Fri, 12 Jul 2024 07:13:14 +0200 Subject: [PATCH 3/4] Removing PPE and INT Live tests --- .../Azure.Communication.CallAutomation/tests.yml | 4 ---- .../Azure.Communication.CallingServer/tests.yml | 4 ---- sdk/communication/Azure.Communication.Chat/tests.yml | 10 +--------- .../Azure.Communication.Identity/tests.yml | 10 +--------- .../Azure.Communication.JobRouter/tests.yml | 6 +----- sdk/communication/Azure.Communication.Rooms/tests.yml | 6 +----- .../Azure.Communication.ShortCodes/tests.yml | 6 +----- 7 files changed, 5 insertions(+), 41 deletions(-) diff --git a/sdk/communication/Azure.Communication.CallAutomation/tests.yml b/sdk/communication/Azure.Communication.CallAutomation/tests.yml index 782f9b73512a9..2628a9d6474fa 100644 --- a/sdk/communication/Azure.Communication.CallAutomation/tests.yml +++ b/sdk/communication/Azure.Communication.CallAutomation/tests.yml @@ -14,10 +14,6 @@ extends: SubscriptionConfigurations: - $(sub-config-communication-services-cloud-test-resources-common) - $(sub-config-communication-services-cloud-test-resources-net) - Int: - SubscriptionConfigurations: - - $(sub-config-communication-int-test-resources-common) - - $(sub-config-communication-int-test-resources-net) Clouds: Public TestResourceDirectories: - communication/ diff --git a/sdk/communication/Azure.Communication.CallingServer/tests.yml b/sdk/communication/Azure.Communication.CallingServer/tests.yml index d07ea4040e651..c0ed92755f724 100644 --- a/sdk/communication/Azure.Communication.CallingServer/tests.yml +++ b/sdk/communication/Azure.Communication.CallingServer/tests.yml @@ -14,10 +14,6 @@ extends: SubscriptionConfigurations: - $(sub-config-communication-services-cloud-test-resources-common) - $(sub-config-communication-services-cloud-test-resources-net) - Int: - SubscriptionConfigurations: - - $(sub-config-communication-int-test-resources-common) - - $(sub-config-communication-int-test-resources-net) Clouds: Public TestResourceDirectories: - communication/ diff --git a/sdk/communication/Azure.Communication.Chat/tests.yml b/sdk/communication/Azure.Communication.Chat/tests.yml index 5176b91957291..5e68bf69c7e7a 100644 --- a/sdk/communication/Azure.Communication.Chat/tests.yml +++ b/sdk/communication/Azure.Communication.Chat/tests.yml @@ -14,14 +14,6 @@ extends: SubscriptionConfigurations: - $(sub-config-communication-services-cloud-test-resources-common) - $(sub-config-communication-services-cloud-test-resources-net) - PPE: - SubscriptionConfigurations: - - $(sub-config-communication-ppe-test-resources-common) - - $(sub-config-communication-ppe-test-resources-net) - Int: - SubscriptionConfigurations: - - $(sub-config-communication-int-test-resources-common) - - $(sub-config-communication-int-test-resources-net) - Clouds: Public,PPE,Int + Clouds: Public TestResourceDirectories: - communication/ diff --git a/sdk/communication/Azure.Communication.Identity/tests.yml b/sdk/communication/Azure.Communication.Identity/tests.yml index 58af760122366..1a6e37f88d2fe 100644 --- a/sdk/communication/Azure.Communication.Identity/tests.yml +++ b/sdk/communication/Azure.Communication.Identity/tests.yml @@ -13,14 +13,6 @@ extends: - eng/common/TestResources/sub-config/AzurePublicMsft.json SubscriptionConfigurations: - $(sub-config-communication-services-cloud-test-resources-cte) - PPE: - SubscriptionConfigurations: - - $(sub-config-communication-ppe-test-resources-common) - - $(sub-config-communication-ppe-test-resources-net) - Int: - SubscriptionConfigurations: - - $(sub-config-communication-int-test-resources-common) - - $(sub-config-communication-int-test-resources-net) - Clouds: Public,PPE,Int + Clouds: Public TestResourceDirectories: - communication/ diff --git a/sdk/communication/Azure.Communication.JobRouter/tests.yml b/sdk/communication/Azure.Communication.JobRouter/tests.yml index 823eb7090adb4..f01ab524377c3 100644 --- a/sdk/communication/Azure.Communication.JobRouter/tests.yml +++ b/sdk/communication/Azure.Communication.JobRouter/tests.yml @@ -14,10 +14,6 @@ extends: SubscriptionConfigurations: - $(sub-config-communication-services-cloud-test-resources-common) - $(sub-config-communication-services-cloud-test-resources-net) - Int: - SubscriptionConfigurations: - - $(sub-config-communication-int-test-resources-common) - - $(sub-config-communication-int-test-resources-net) - Clouds: Public,Int + Clouds: Public TestResourceDirectories: - communication/ diff --git a/sdk/communication/Azure.Communication.Rooms/tests.yml b/sdk/communication/Azure.Communication.Rooms/tests.yml index 32e8c04a68610..879b599266394 100644 --- a/sdk/communication/Azure.Communication.Rooms/tests.yml +++ b/sdk/communication/Azure.Communication.Rooms/tests.yml @@ -14,10 +14,6 @@ extends: SubscriptionConfigurations: - $(sub-config-communication-services-cloud-test-resources-common) - $(sub-config-communication-services-cloud-test-resources-net) - PPE: - SubscriptionConfigurations: - - $(sub-config-communication-ppe-test-resources-common) - - $(sub-config-communication-ppe-test-resources-net) - Clouds: Public,PPE + Clouds: Public TestResourceDirectories: - communication/ diff --git a/sdk/communication/Azure.Communication.ShortCodes/tests.yml b/sdk/communication/Azure.Communication.ShortCodes/tests.yml index 683ba29b45590..6841a6955a171 100644 --- a/sdk/communication/Azure.Communication.ShortCodes/tests.yml +++ b/sdk/communication/Azure.Communication.ShortCodes/tests.yml @@ -14,10 +14,6 @@ extends: SubscriptionConfigurations: - $(sub-config-communication-services-cloud-test-resources-common) - $(sub-config-communication-services-cloud-test-resources-net) - Int: - SubscriptionConfigurations: - - $(sub-config-communication-int-test-resources-common) - - $(sub-config-communication-int-test-resources-net) - Clouds: Public,Int + Clouds: Public TestResourceDirectories: - communication/ From 62596e561c0fa9da230b4c89ff603cebbf0d4887 Mon Sep 17 00:00:00 2001 From: rajuanitha88 Date: Wed, 17 Jul 2024 10:09:44 +0200 Subject: [PATCH 4/4] Addressing comments to maintain consistency across languages --- sdk/communication/Azure.Communication.Identity/tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sdk/communication/Azure.Communication.Identity/tests.yml b/sdk/communication/Azure.Communication.Identity/tests.yml index 1a6e37f88d2fe..ab2ebd9c0fc3a 100644 --- a/sdk/communication/Azure.Communication.Identity/tests.yml +++ b/sdk/communication/Azure.Communication.Identity/tests.yml @@ -12,7 +12,8 @@ extends: SubscriptionConfigurationFilePaths: - eng/common/TestResources/sub-config/AzurePublicMsft.json SubscriptionConfigurations: - - $(sub-config-communication-services-cloud-test-resources-cte) + - $(sub-config-communication-services-cloud-test-resources-common) + - $(sub-config-communication-services-cloud-test-resources-net) Clouds: Public TestResourceDirectories: - communication/